diff --git a/briar-android/src/main/res/layout/activity_change_password.xml b/briar-android/src/main/res/layout/activity_change_password.xml
index cfdf1ccd7..1737eb331 100644
--- a/briar-android/src/main/res/layout/activity_change_password.xml
+++ b/briar-android/src/main/res/layout/activity_change_password.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -11,12 +10,12 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:paddingBottom="@dimen/margin_activity_vertical"
-		android:paddingEnd="@dimen/margin_activity_horizontal"
-		android:paddingLeft="@dimen/margin_activity_horizontal"
-		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingStart="@dimen/margin_activity_horizontal"
-		android:paddingTop="@dimen/margin_activity_vertical">
+		android:paddingLeft="@dimen/margin_activity_horizontal"
+		android:paddingTop="@dimen/margin_activity_vertical"
+		android:paddingEnd="@dimen/margin_activity_horizontal"
+		android:paddingRight="@dimen/margin_activity_horizontal"
+		android:paddingBottom="@dimen/margin_activity_vertical">
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/current_password_entry_wrapper"
@@ -29,16 +28,16 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:passwordToggleEnabled="true">
 
-			<android.support.design.widget.TextInputEditText
+			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/current_password_entry"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/current_password"
 				android:importantForAutofill="no"
 				android:inputType="textPassword"
-				android:maxLines="1"/>
+				android:maxLines="1" />
 
-			<requestFocus/>
+			<requestFocus />
 
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -53,14 +52,14 @@
 			app:layout_constraintTop_toBottomOf="@id/current_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
-			<android.support.design.widget.TextInputEditText
+			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/new_password_entry"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/choose_new_password"
 				android:importantForAutofill="no"
 				android:inputType="textPassword"
-				android:maxLines="1"/>
+				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<com.google.android.material.textfield.TextInputLayout
@@ -74,7 +73,7 @@
 			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
-			<android.support.design.widget.TextInputEditText
+			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/new_password_confirm"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -82,7 +81,7 @@
 				android:imeOptions="actionDone"
 				android:importantForAutofill="no"
 				android:inputType="textPassword"
-				android:maxLines="1"/>
+				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<org.briarproject.briar.android.login.StrengthMeter
@@ -92,7 +91,7 @@
 			android:visibility="invisible"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper"/>
+			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper" />
 
 		<Button
 			android:id="@+id/change_password"
@@ -105,7 +104,7 @@
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/strength_meter"
-			tools:enabled="true"/>
+			tools:enabled="true" />
 
 		<ProgressBar
 			android:id="@+id/progress_wheel"
@@ -114,7 +113,7 @@
 			android:visibility="invisible"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="@id/change_password"/>
+			app:layout_constraintTop_toTopOf="@id/change_password" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/activity_conversation.xml b/briar-android/src/main/res/layout/activity_conversation.xml
index 0ae98e366..b2908bcf6 100644
--- a/briar-android/src/main/res/layout/activity_conversation.xml
+++ b/briar-android/src/main/res/layout/activity_conversation.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -24,20 +23,20 @@
 				android:layout_height="match_parent"
 				android:orientation="horizontal">
 
-				<include layout="@layout/contact_avatar_status"/>
+				<include layout="@layout/contact_avatar_status" />
 
 				<com.vanniktech.emoji.EmojiTextView
 					android:id="@+id/contactName"
 					style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/margin_medium"
 					android:layout_marginStart="@dimen/margin_medium"
+					android:layout_marginLeft="@dimen/margin_medium"
 					android:ellipsize="end"
 					android:gravity="center_vertical"
 					android:maxLines="1"
 					android:textColor="@color/action_bar_text"
-					tools:text="Contact Name of someone who chose a long name"/>
+					tools:text="Contact Name of someone who chose a long name" />
 
 			</LinearLayout>
 
@@ -50,7 +49,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="2"
-		app:scrollToEnd="false"/>
+		app:scrollToEnd="false" />
 
 	<org.briarproject.briar.android.view.ImagePreview
 		android:id="@+id/imagePreview"
@@ -58,12 +57,12 @@
 		android:layout_height="0dp"
 		android:layout_weight="1"
 		android:visibility="gone"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<org.briarproject.briar.android.view.TextInputView
 		android:id="@+id/text_input_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		app:hint="@string/message_hint"/>
+		app:hint="@string/message_hint" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_create_forum.xml b/briar-android/src/main/res/layout/activity_create_forum.xml
index 3428c7538..6f0502ef6 100644
--- a/briar-android/src/main/res/layout/activity_create_forum.xml
+++ b/briar-android/src/main/res/layout/activity_create_forum.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -15,16 +14,16 @@
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
-		<android.support.design.widget.TextInputEditText
+		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/createForumNameEntry"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/choose_forum_hint"
 			android:importantForAutofill="no"
 			android:inputType="text|textCapSentences"
-			android:maxLines="1"/>
+			android:maxLines="1" />
 
-		<requestFocus/>
+		<requestFocus />
 
 	</com.google.android.material.textfield.TextInputLayout>
 
@@ -33,7 +32,7 @@
 		style="@style/BriarButton"
 		android:enabled="false"
 		android:text="@string/create_forum_button"
-		tools:enabled="true"/>
+		tools:enabled="true" />
 
 	<ProgressBar
 		android:id="@+id/createForumProgressBar"
@@ -42,6 +41,6 @@
 		android:layout_gravity="center"
 		android:indeterminate="true"
 		android:visibility="gone"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_dev_report.xml b/briar-android/src/main/res/layout/activity_dev_report.xml
index c06205faf..6edab7474 100644
--- a/briar-android/src/main/res/layout/activity_dev_report.xml
+++ b/briar-android/src/main/res/layout/activity_dev_report.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
@@ -9,11 +8,11 @@
 		android:id="@+id/appBar"
 		layout="@layout/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"/>
+		android:layout_height="wrap_content" />
 
 	<FrameLayout
 		android:id="@+id/fragmentContainer"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"/>
+		android:layout_height="match_parent" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_expired.xml b/briar-android/src/main/res/layout/activity_expired.xml
index fc99a4112..a6f335bec 100644
--- a/briar-android/src/main/res/layout/activity_expired.xml
+++ b/briar-android/src/main/res/layout/activity_expired.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_margin="@dimen/margin_large"
@@ -18,7 +16,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:gravity="center"
 			android:text="@string/expiry_date_reached"
-			android:textSize="@dimen/text_size_large"/>
+			android:textSize="@dimen/text_size_large" />
 
 		<TextView
 			android:layout_width="match_parent"
@@ -26,7 +24,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:gravity="center"
 			android:text="@string/download_briar"
-			android:textSize="@dimen/text_size_large"/>
+			android:textSize="@dimen/text_size_large" />
 
 		<TextView
 			android:layout_width="match_parent"
@@ -34,7 +32,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:gravity="center"
 			android:text="@string/create_new_account"
-			android:textSize="@dimen/text_size_large"/>
+			android:textSize="@dimen/text_size_large" />
 
 		<Button
 			android:id="@+id/download_briar_button"
@@ -42,6 +40,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_margin="@dimen/margin_medium"
-			android:text="@string/download_briar_button"/>
+			android:text="@string/download_briar_button" />
 	</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_fragment_container.xml b/briar-android/src/main/res/layout/activity_fragment_container.xml
index e6c20760f..9e6dbe58a 100644
--- a/briar-android/src/main/res/layout/activity_fragment_container.xml
+++ b/briar-android/src/main/res/layout/activity_fragment_container.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/fragmentContainer"
-	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"/>
\ No newline at end of file
+	android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml b/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
index 442bc6de7..8718e0b18 100644
--- a/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
+++ b/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	tools:context=".android.keyagreement.KeyAgreementActivity">
 
-	<include layout="@layout/toolbar"/>
+	<include layout="@layout/toolbar" />
 
-	<FrameLayout
+	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/fragmentContainer"
-		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"/>
+		android:layout_height="match_parent" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_image.xml b/briar-android/src/main/res/layout/activity_image.xml
index e4c3b7774..be5f2f0fd 100644
--- a/briar-android/src/main/res/layout/activity_image.xml
+++ b/briar-android/src/main/res/layout/activity_image.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.PullDownLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.PullDownLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="@color/briar_black"
@@ -12,7 +11,7 @@
 		android:id="@+id/viewPager"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		tools:background="@color/briar_green_light"/>
+		tools:background="@color/briar_green_light" />
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appBarLayout"
@@ -41,14 +40,14 @@
 					android:ellipsize="end"
 					android:maxLines="1"
 					android:textColor="@color/action_bar_text"
-					tools:text="Contact Name of someone who chose a long name"/>
+					tools:text="Contact Name of someone who chose a long name" />
 
 				<TextView
 					android:id="@+id/dateView"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textColor="@color/action_bar_text"
-					tools:text="date"/>
+					tools:text="date" />
 
 			</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/activity_nav_drawer.xml b/briar-android/src/main/res/layout/activity_nav_drawer.xml
index f7b0e4c43..c1f0a2aea 100644
--- a/briar-android/src/main/res/layout/activity_nav_drawer.xml
+++ b/briar-android/src/main/res/layout/activity_nav_drawer.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-	android:id="@+id/drawer_layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/drawer_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context=".android.navdrawer.NavDrawerActivity">
@@ -21,7 +20,7 @@
 			android:layout_height="wrap_content"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<androidx.constraintlayout.widget.ConstraintLayout
 			android:id="@+id/expiryWarning"
@@ -45,7 +44,7 @@
 				android:textSize="@dimen/text_size_small"
 				app:layout_constraintEnd_toStartOf="@+id/expiryWarningClose"
 				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"/>
+				app:layout_constraintTop_toTopOf="parent" />
 
 			<ImageView
 				android:id="@+id/expiryWarningClose"
@@ -57,7 +56,7 @@
 				android:tint="@color/briar_text_tertiary_inverse"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintTop_toTopOf="parent"/>
+				app:layout_constraintTop_toTopOf="parent" />
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -68,7 +67,7 @@
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/expiryWarning"/>
+			app:layout_constraintTop_toBottomOf="@+id/expiryWarning" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -77,6 +76,6 @@
 		layout="@layout/navigation_menu"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
-		android:layout_gravity="start"/>
+		android:layout_gravity="start" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/briar-android/src/main/res/layout/activity_panic_preferences.xml b/briar-android/src/main/res/layout/activity_panic_preferences.xml
index c7f67ea03..f4477332e 100644
--- a/briar-android/src/main/res/layout/activity_panic_preferences.xml
+++ b/briar-android/src/main/res/layout/activity_panic_preferences.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
 	<fragment
 		android:id="@+id/fragment"
+		android:name="org.briarproject.briar.android.panic.PanicPreferencesFragment"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:name="org.briarproject.briar.android.panic.PanicPreferencesFragment"/>
+		android:layout_height="match_parent" />
 </FrameLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_reveal_contacts.xml b/briar-android/src/main/res/layout/activity_reveal_contacts.xml
index 4faa8c869..dbbbfd38c 100644
--- a/briar-android/src/main/res/layout/activity_reveal_contacts.xml
+++ b/briar-android/src/main/res/layout/activity_reveal_contacts.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -11,15 +10,15 @@
 		android:id="@+id/fragmentContainer"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1"/>
+		android:layout_weight="1" />
 
 	<Button
 		android:id="@+id/revealButton"
 		style="@style/BriarButton"
-		android:layout_marginEnd="@dimen/margin_small"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/margin_small"
 		android:layout_marginStart="@dimen/margin_small"
-		android:text="@string/groups_reveal_contacts"/>
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
+		android:text="@string/groups_reveal_contacts" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_rss_feed_import.xml b/briar-android/src/main/res/layout/activity_rss_feed_import.xml
index f93913f2f..725c991b2 100644
--- a/briar-android/src/main/res/layout/activity_rss_feed_import.xml
+++ b/briar-android/src/main/res/layout/activity_rss_feed_import.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -18,7 +17,7 @@
 		app:cardCornerRadius="0dp"
 		app:cardUseCompatPadding="false">
 
-		<android.support.design.widget.TextInputEditText
+		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/urlInput"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -31,9 +30,9 @@
 			android:padding="@dimen/margin_medium"
 			android:textColor="?android:attr/textColorPrimary">
 
-			<requestFocus/>
+			<requestFocus />
 
-		</android.support.design.widget.TextInputEditText>
+		</com.google.android.material.textfield.TextInputEditText>
 
 	</androidx.cardview.widget.CardView>
 
@@ -42,7 +41,7 @@
 		style="@style/BriarButton"
 		android:enabled="false"
 		android:text="@string/blogs_rss_feeds_import_button"
-		tools:enabled="true"/>
+		tools:enabled="true" />
 
 	<ProgressBar
 		android:id="@+id/progressBar"
@@ -51,6 +50,6 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
 		android:visibility="gone"
-		tools:visibility="gone"/>
+		tools:visibility="gone" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_rss_feed_manage.xml b/briar-android/src/main/res/layout/activity_rss_feed_manage.xml
index 76c14b4aa..bc3b9ba65 100644
--- a/briar-android/src/main/res/layout/activity_rss_feed_manage.xml
+++ b/briar-android/src/main/res/layout/activity_rss_feed_manage.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
+<org.briarproject.briar.android.view.BriarRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/feedList"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	app:scrollToEnd="false"
 	app:emptyText="@string/blogs_rss_feeds_manage_empty_state"
-	tools:listitem="@layout/list_item_rss_feed"/>
\ No newline at end of file
+	app:scrollToEnd="false"
+	tools:listitem="@layout/list_item_rss_feed" />
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_settings.xml b/briar-android/src/main/res/layout/activity_settings.xml
index a75d590ab..f5c555431 100644
--- a/briar-android/src/main/res/layout/activity_settings.xml
+++ b/briar-android/src/main/res/layout/activity_settings.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
 	<fragment
 		android:id="@+id/fragment"
+		android:name="org.briarproject.briar.android.settings.SettingsFragment"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:name="org.briarproject.briar.android.settings.SettingsFragment"/>
+		android:layout_height="match_parent" />
 </FrameLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_sharing_status.xml b/briar-android/src/main/res/layout/activity_sharing_status.xml
index d376acb9b..52c2af16f 100644
--- a/briar-android/src/main/res/layout/activity_sharing_status.xml
+++ b/briar-android/src/main/res/layout/activity_sharing_status.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -11,14 +10,14 @@
 		android:id="@+id/infoView"
 		android:layout_width="wrap_content"
 		android:layout_height="0dp"
-		android:layout_marginLeft="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:elevation="@dimen/margin_tiny"
 		android:src="@drawable/ic_info_white"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:tint="?attr/colorControlNormal"/>
+		app:tint="?attr/colorControlNormal" />
 
 	<TextView
 		android:id="@+id/info"
@@ -32,7 +31,7 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/infoView"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="@string/sharing_status_forum"/>
+		tools:text="@string/sharing_status_forum" />
 
 	<View
 		android:id="@+id/divider"
@@ -40,7 +39,7 @@
 		android:elevation="@dimen/margin_tiny"
 		app:layout_constraintBottom_toTopOf="@+id/list"
 		app:layout_constraintStart_toStartOf="@+id/info"
-		app:layout_constraintTop_toBottomOf="@+id/info"/>
+		app:layout_constraintTop_toBottomOf="@+id/info" />
 
 	<org.briarproject.briar.android.view.BriarRecyclerView
 		android:id="@+id/list"
@@ -51,6 +50,6 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/divider"
 		app:scrollToEnd="false"
-		tools:listitem="@layout/list_item_contact_small"/>
+		tools:listitem="@layout/list_item_contact_small" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_test_data.xml b/briar-android/src/main/res/layout/activity_test_data.xml
index c1a2d558b..bd0c13dc6 100644
--- a/briar-android/src/main/res/layout/activity_test_data.xml
+++ b/briar-android/src/main/res/layout/activity_test_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -20,7 +19,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:text="Number of contacts"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<SeekBar
 			android:id="@+id/seekBarContacts"
@@ -30,7 +29,7 @@
 			android:progress="20"
 			app:layout_constraintEnd_toStartOf="@+id/textViewContactsSb"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewContacts"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewContacts" />
 
 		<TextView
 			android:id="@+id/textViewContactsSb"
@@ -40,7 +39,7 @@
 			android:text="20"
 			app:layout_constraintBottom_toBottomOf="@+id/seekBarContacts"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewContacts"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewContacts" />
 
 		<TextView
 			android:id="@+id/textViewMessages"
@@ -49,7 +48,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:text="Number of messages per contact"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/seekBarContacts"/>
+			app:layout_constraintTop_toBottomOf="@+id/seekBarContacts" />
 
 		<SeekBar
 			android:id="@+id/seekBarMessages"
@@ -60,7 +59,7 @@
 			android:progress="20"
 			app:layout_constraintEnd_toStartOf="@+id/textViewMessagesSb"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewMessages"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewMessages" />
 
 		<TextView
 			android:id="@+id/textViewMessagesSb"
@@ -70,7 +69,7 @@
 			android:text="20"
 			app:layout_constraintBottom_toBottomOf="@+id/seekBarMessages"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewMessages"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewMessages" />
 
 		<TextView
 			android:id="@+id/textViewBlogPosts"
@@ -79,7 +78,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:text="Number of blog posts"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/seekBarMessages"/>
+			app:layout_constraintTop_toBottomOf="@+id/seekBarMessages" />
 
 		<SeekBar
 			android:id="@+id/seekBarBlogPosts"
@@ -90,7 +89,7 @@
 			android:progress="20"
 			app:layout_constraintEnd_toStartOf="@+id/TextViewBlogPostsSb"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewBlogPosts"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewBlogPosts" />
 
 		<TextView
 			android:id="@+id/TextViewBlogPostsSb"
@@ -100,7 +99,7 @@
 			android:text="20"
 			app:layout_constraintBottom_toBottomOf="@+id/seekBarBlogPosts"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewBlogPosts"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewBlogPosts" />
 
 		<TextView
 			android:id="@+id/textViewForums"
@@ -109,7 +108,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:text="Number of forums"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/seekBarBlogPosts"/>
+			app:layout_constraintTop_toBottomOf="@+id/seekBarBlogPosts" />
 
 		<SeekBar
 			android:id="@+id/seekBarForums"
@@ -120,7 +119,7 @@
 			android:progress="5"
 			app:layout_constraintEnd_toStartOf="@+id/TextViewForumsSb"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewForums"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewForums" />
 
 		<TextView
 			android:id="@+id/TextViewForumsSb"
@@ -130,7 +129,7 @@
 			android:text="5"
 			app:layout_constraintBottom_toBottomOf="@+id/seekBarForums"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewForums"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewForums" />
 
 		<TextView
 			android:id="@+id/textViewForumMessages"
@@ -139,7 +138,7 @@
 			android:layout_margin="@dimen/margin_medium"
 			android:text="Number of forum messages"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/seekBarForums"/>
+			app:layout_constraintTop_toBottomOf="@+id/seekBarForums" />
 
 		<SeekBar
 			android:id="@+id/seekBarForumMessages"
@@ -150,7 +149,7 @@
 			android:progress="20"
 			app:layout_constraintEnd_toStartOf="@+id/TextViewForumMessagesSb"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewForumMessages"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewForumMessages" />
 
 		<TextView
 			android:id="@+id/TextViewForumMessagesSb"
@@ -160,7 +159,7 @@
 			android:text="20"
 			app:layout_constraintBottom_toBottomOf="@+id/seekBarForumMessages"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewForumMessages"/>
+			app:layout_constraintTop_toBottomOf="@+id/textViewForumMessages" />
 
 		<Button
 			android:id="@+id/buttonCreateTestData"
@@ -173,7 +172,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/seekBarForumMessages"
-			app:layout_constraintVertical_bias="1.0"/>
+			app:layout_constraintVertical_bias="1.0" />
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
diff --git a/briar-android/src/main/res/layout/activity_threaded_conversation.xml b/briar-android/src/main/res/layout/activity_threaded_conversation.xml
index 09bec0926..19753cac9 100644
--- a/briar-android/src/main/res/layout/activity_threaded_conversation.xml
+++ b/briar-android/src/main/res/layout/activity_threaded_conversation.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -8,7 +7,7 @@
 	android:orientation="vertical"
 	tools:context=".android.forum.ForumActivity">
 
-	<include layout="@layout/toolbar"/>
+	<include layout="@layout/toolbar" />
 
 	<FrameLayout
 		android:layout_width="match_parent"
@@ -21,21 +20,21 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			app:emptyText="@string/no_forum_posts"
-			app:scrollToEnd="false"/>
+			app:scrollToEnd="false" />
 
 		<org.briarproject.briar.android.view.UnreadMessageButton
 			android:id="@+id/upButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="top|right|end"
-			app:direction="up"/>
+			app:direction="up" />
 
 		<org.briarproject.briar.android.view.UnreadMessageButton
 			android:id="@+id/downButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="bottom|right|end"
-			app:direction="down"/>
+			app:direction="down" />
 
 	</FrameLayout>
 
@@ -43,6 +42,6 @@
 		android:id="@+id/text_input_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		app:hint="@string/forum_new_message_hint"/>
+		app:hint="@string/forum_new_message_hint" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_unlock.xml b/briar-android/src/main/res/layout/activity_unlock.xml
index 7977f9d4e..8214c059f 100644
--- a/briar-android/src/main/res/layout/activity_unlock.xml
+++ b/briar-android/src/main/res/layout/activity_unlock.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -19,6 +18,6 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0.1"
-		app:tint="?attr/colorControlNormal"/>
+		app:tint="?attr/colorControlNormal" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_write_blog_post.xml b/briar-android/src/main/res/layout/activity_write_blog_post.xml
index df7453d78..880a6191c 100644
--- a/briar-android/src/main/res/layout/activity_write_blog_post.xml
+++ b/briar-android/src/main/res/layout/activity_write_blog_post.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -16,7 +15,7 @@
 		app:fillHeight="true"
 		app:hint="@string/blogs_write_blog_post_body_hint">
 
-		<requestFocus/>
+		<requestFocus />
 
 	</org.briarproject.briar.android.view.LargeTextInputView>
 
@@ -26,6 +25,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
-		android:visibility="invisible"/>
+		android:visibility="invisible" />
 
 </FrameLayout>
diff --git a/briar-android/src/main/res/layout/author_view.xml b/briar-android/src/main/res/layout/author_view.xml
index 6b59e2bf1..a90aeb046 100644
--- a/briar-android/src/main/res/layout/author_view.xml
+++ b/briar-android/src/main/res/layout/author_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	android:id="@+id/merge"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/merge"
 	tools:layout_height="wrap_content"
 	tools:layout_width="match_parent"
 	tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
@@ -20,7 +19,7 @@
 		app:layout_constraintHorizontal_chainStyle="packed"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:src="@mipmap/ic_launcher_round"/>
+		tools:src="@mipmap/ic_launcher_round" />
 
 	<ImageView
 		android:id="@+id/avatarIcon"
@@ -33,23 +32,23 @@
 		android:src="@drawable/ic_repeat"
 		android:visibility="invisible"
 		app:layout_constraintBottom_toBottomOf="@+id/avatar"
-		app:layout_constraintEnd_toEndOf="@+id/avatar"/>
+		app:layout_constraintEnd_toEndOf="@+id/avatar" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/authorName"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintEnd_toStartOf="@+id/trustIndicator"
 		app:layout_constraintStart_toEndOf="@+id/avatar"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="Author View that can have a long name"/>
+		tools:text="Author View that can have a long name" />
 
 	<org.briarproject.briar.android.view.TrustIndicatorView
 		android:id="@+id/trustIndicator"
@@ -61,7 +60,7 @@
 		app:layout_constraintTop_toTopOf="@+id/authorName"
 		app:layout_goneMarginEnd="0dp"
 		app:layout_goneMarginStart="0dp"
-		tools:src="@drawable/trust_indicator_verified"/>
+		tools:src="@drawable/trust_indicator_verified" />
 
 	<TextView
 		android:id="@+id/dateView"
@@ -72,6 +71,6 @@
 		app:layout_constraintStart_toStartOf="@+id/authorName"
 		app:layout_constraintTop_toBottomOf="@+id/authorName"
 		tools:text="yesterday"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 </merge>
diff --git a/briar-android/src/main/res/layout/briar_recycler_view.xml b/briar-android/src/main/res/layout/briar_recycler_view.xml
index 4e7d4b413..8bd992c85 100644
--- a/briar-android/src/main/res/layout/briar_recycler_view.xml
+++ b/briar-android/src/main/res/layout/briar_recycler_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -14,7 +13,7 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:listitem="@layout/list_item_contact"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<ProgressBar
 		android:id="@+id/progressBar"
@@ -25,24 +24,24 @@
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintRight_toRightOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:visibility="invisible"/>
+		tools:visibility="invisible" />
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/emptyImage"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		app:layout_constraintBottom_toTopOf="@+id/emptyText"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed"
 		app:tint="?attr/colorControlNormal"
-		tools:src="@drawable/ic_empty_state_group_list"/>
+		tools:src="@drawable/ic_empty_state_group_list" />
 
 	<TextView
 		android:id="@+id/emptyText"
@@ -56,21 +55,21 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/emptyImage"
-		tools:text="@string/no_contacts"/>
+		tools:text="@string/no_contacts" />
 
 	<TextView
 		android:id="@+id/emptyAction"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:gravity="center"
-		android:paddingBottom="@dimen/margin_large"
 		android:paddingLeft="@dimen/margin_large"
 		android:paddingRight="@dimen/margin_large"
+		android:paddingBottom="@dimen/margin_large"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/emptyText"
-		tools:text="@string/no_contacts_action"/>
+		tools:text="@string/no_contacts_action" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/checkbox.xml b/briar-android/src/main/res/layout/checkbox.xml
index e5cf27a1d..b08cba81b 100644
--- a/briar-android/src/main/res/layout/checkbox.xml
+++ b/briar-android/src/main/res/layout/checkbox.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -8,10 +7,10 @@
 		android:id="@+id/checkbox"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_activity_horizontal"
 		android:layout_marginStart="@dimen/margin_activity_horizontal"
+		android:layout_marginLeft="@dimen/margin_activity_horizontal"
 		android:layout_marginTop="@dimen/margin_activity_vertical"
 		android:checked="false"
-		android:text="@string/don_t_ask_again"/>
+		android:text="@string/don_t_ask_again" />
 
 </FrameLayout>
diff --git a/briar-android/src/main/res/layout/contact_avatar_status.xml b/briar-android/src/main/res/layout/contact_avatar_status.xml
index 18fee6a1d..f499e4ba0 100644
--- a/briar-android/src/main/res/layout/contact_avatar_status.xml
+++ b/briar-android/src/main/res/layout/contact_avatar_status.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="32dp"
@@ -13,7 +12,7 @@
 		android:layout_width="30dp"
 		android:layout_height="30dp"
 		app:civ_border_color="@color/action_bar_text"
-		tools:src="@mipmap/ic_launcher_round"/>
+		tools:src="@mipmap/ic_launcher_round" />
 
 	<ImageView
 		android:id="@+id/contactStatus"
@@ -22,6 +21,6 @@
 		android:layout_gravity="bottom|end|right"
 		android:scaleType="fitCenter"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_online"/>
+		tools:src="@drawable/contact_online" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/dialog_screen_filter.xml b/briar-android/src/main/res/layout/dialog_screen_filter.xml
index b15e6b310..a591bb968 100644
--- a/briar-android/src/main/res/layout/dialog_screen_filter.xml
+++ b/briar-android/src/main/res/layout/dialog_screen_filter.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -16,7 +15,7 @@
 			android:id="@+id/screen_filter_message"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			tools:text="@string/screen_filter_body"/>
+			tools:text="@string/screen_filter_body" />
 
 	</ScrollView>
 
@@ -26,6 +25,6 @@
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/margin_large"
 		android:layout_weight="0"
-		android:text="@string/screen_filter_allow"/>
+		android:text="@string/screen_filter_allow" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/emoji_text_input_view.xml b/briar-android/src/main/res/layout/emoji_text_input_view.xml
index d6d547cc2..e5979c12e 100644
--- a/briar-android/src/main/res/layout/emoji_text_input_view.xml
+++ b/briar-android/src/main/res/layout/emoji_text_input_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -18,7 +17,7 @@
 		android:padding="@dimen/margin_small"
 		android:scaleType="center"
 		android:src="@drawable/ic_emoji_toggle"
-		app:tint="?attr/colorControlNormal"/>
+		app:tint="?attr/colorControlNormal" />
 
 	<com.vanniktech.emoji.EmojiEditText
 		android:id="@+id/input_text"
@@ -30,6 +29,6 @@
 		android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
 		android:minHeight="@dimen/text_input_height"
 		android:textColor="?android:attr/textColorPrimary"
-		tools:text="Line 1\nLine 2\nLine 3"/>
+		tools:text="Line 1\nLine 2\nLine 3" />
 
 </merge>
diff --git a/briar-android/src/main/res/layout/fragment_alias_dialog.xml b/briar-android/src/main/res/layout/fragment_alias_dialog.xml
index 8cc5ff696..2aaf84d6a 100644
--- a/briar-android/src/main/res/layout/fragment_alias_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_alias_dialog.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="wrap_content"
 	android:orientation="vertical"
 	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
-	android:paddingTop="16dp">
+	android:paddingTop="16dp"
+	android:paddingRight="16dp">
 
 	<TextView
 		android:id="@+id/titleView"
@@ -16,7 +15,7 @@
 		android:text="@string/set_contact_alias"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_large"
-		android:textStyle="bold"/>
+		android:textStyle="bold" />
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/aliasEditLayout"
@@ -33,15 +32,15 @@
 			android:hint="@string/set_contact_alias_hint"
 			android:inputType="text|textCapWords"
 			android:textColor="?android:attr/textColorPrimary"
-			android:textSize="@dimen/text_size_medium"/>
+			android:textSize="@dimen/text_size_medium" />
 
 	</com.google.android.material.textfield.TextInputLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_xxlarge"
 		android:layout_marginStart="@dimen/margin_xxlarge"
+		android:layout_marginLeft="@dimen/margin_xxlarge"
 		android:gravity="end"
 		android:orientation="horizontal">
 
@@ -50,14 +49,14 @@
 			style="@style/BriarButtonFlat.Negative"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/cancel"/>
+			android:text="@string/cancel" />
 
 		<Button
 			android:id="@+id/setButton"
 			style="@style/BriarButtonFlat.Positive"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/set_alias_button"/>
+			android:text="@string/set_alias_button" />
 
 	</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_blog.xml b/briar-android/src/main/res/layout/fragment_blog.xml
index df5e36a9e..0281a9ed1 100644
--- a/briar-android/src/main/res/layout/fragment_blog.xml
+++ b/briar-android/src/main/res/layout/fragment_blog.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	android:id="@+id/postList"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.BriarRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/postList"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:scrollToEnd="false"
-	tools:context=".android.blog.BlogActivity"/>
+	tools:context=".android.blog.BlogActivity" />
diff --git a/briar-android/src/main/res/layout/fragment_blog_post.xml b/briar-android/src/main/res/layout/fragment_blog_post.xml
index 312d7704c..0824308cd 100644
--- a/briar-android/src/main/res/layout/fragment_blog_post.xml
+++ b/briar-android/src/main/res/layout/fragment_blog_post.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -18,14 +17,14 @@
 			style="@style/BriarCard"
 			layout="@layout/list_item_blog_post"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"/>
+			android:layout_height="wrap_content" />
 
 		<ProgressBar
 			android:id="@+id/progressBar"
 			style="?android:attr/progressBarStyleLarge"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center"/>
+			android:layout_gravity="center" />
 
 	</FrameLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_contact_list.xml b/briar-android/src/main/res/layout/fragment_contact_list.xml
index 64950541f..d4575794b 100644
--- a/briar-android/src/main/res/layout/fragment_contact_list.xml
+++ b/briar-android/src/main/res/layout/fragment_contact_list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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">
@@ -10,7 +9,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior"
-		app:scrollToEnd="false"/>
+		app:scrollToEnd="false" />
 
 	<io.github.kobakei.materialfabspeeddial.FabSpeedDial
 		android:id="@+id/speedDial"
@@ -22,6 +21,6 @@
 		app:fab_miniFabTextBackground="@color/briar_accent"
 		app:fab_miniFabTextColor="@android:color/white"
 		app:layout_anchorGravity="bottom|right|end"
-		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior"/>
+		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
index a0ff15cd9..9603406e5 100644
--- a/briar-android/src/main/res/layout/fragment_crash.xml
+++ b/briar-android/src/main/res/layout/fragment_crash.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -34,7 +33,7 @@
 				app:layout_constraintTop_toTopOf="parent"
 				app:layout_constraintVertical_chainStyle="packed"
 				app:tint="?attr/colorControlNormal"
-				tools:ignore="ContentDescription"/>
+				tools:ignore="ContentDescription" />
 
 			<TextView
 				android:id="@+id/crashed"
@@ -48,7 +47,7 @@
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/errorIcon"
-				tools:layout_editor_absoluteY="8dp"/>
+				tools:layout_editor_absoluteY="8dp" />
 
 			<TextView
 				android:id="@+id/fault"
@@ -62,7 +61,7 @@
 				app:layout_constraintBottom_toTopOf="@+id/pleaseSend"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/crashed"/>
+				app:layout_constraintTop_toBottomOf="@+id/crashed" />
 
 			<TextView
 				android:id="@+id/pleaseSend"
@@ -76,7 +75,7 @@
 				app:layout_constraintBottom_toTopOf="@+id/encrypted"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/fault"/>
+				app:layout_constraintTop_toBottomOf="@+id/fault" />
 
 			<TextView
 				android:id="@+id/encrypted"
@@ -90,7 +89,7 @@
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/pleaseSend"/>
+				app:layout_constraintTop_toBottomOf="@+id/pleaseSend" />
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -106,7 +105,7 @@
 		app:layout_constraintEnd_toStartOf="@+id/acceptButton"
 		app:layout_constraintHorizontal_weight="1"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
+		app:layout_constraintTop_toTopOf="@+id/acceptButton" />
 
 	<Button
 		android:id="@+id/acceptButton"
@@ -118,6 +117,6 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_weight="1"
 		app:layout_constraintStart_toEndOf="@+id/declineButton"
-		app:layout_constraintTop_toBottomOf="@+id/scrollView"/>
+		app:layout_constraintTop_toBottomOf="@+id/scrollView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_create_group.xml b/briar-android/src/main/res/layout/fragment_create_group.xml
index 818f626bc..10786b5a4 100644
--- a/briar-android/src/main/res/layout/fragment_create_group.xml
+++ b/briar-android/src/main/res/layout/fragment_create_group.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -15,16 +14,16 @@
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
-		<android.support.design.widget.TextInputEditText
+		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/name"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/groups_create_group_hint"
 			android:importantForAutofill="no"
 			android:inputType="text|textCapSentences"
-			android:maxLines="1"/>
+			android:maxLines="1" />
 
-		<requestFocus/>
+		<requestFocus />
 
 	</com.google.android.material.textfield.TextInputLayout>
 
@@ -33,7 +32,7 @@
 		style="@style/BriarButton"
 		android:enabled="false"
 		android:text="@string/groups_create_group_button"
-		tools:enabled="true"/>
+		tools:enabled="true" />
 
 	<ProgressBar
 		android:id="@+id/progressBar"
@@ -42,6 +41,6 @@
 		android:layout_gravity="center"
 		android:indeterminate="true"
 		android:visibility="gone"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml
index f6ad6ed73..300ff69a0 100644
--- a/briar-android/src/main/res/layout/fragment_error.xml
+++ b/briar-android/src/main/res/layout/fragment_error.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,46 +9,46 @@
 		android:id="@+id/errorIcon"
 		android:layout_width="128dp"
 		android:layout_height="128dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginRight="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginRight="8dp"
 		android:src="@drawable/alerts_and_states_error"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:tint="?attr/colorControlNormal"
-		tools:ignore="ContentDescription"/>
+		tools:ignore="ContentDescription" />
 
 	<TextView
 		android:id="@+id/errorTitle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginRight="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginRight="8dp"
 		android:text="@string/sorry"
 		android:textSize="@dimen/text_size_xlarge"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/errorIcon"/>
+		app:layout_constraintTop_toBottomOf="@+id/errorIcon" />
 
 	<TextView
 		android:id="@+id/errorMessage"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="8dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/errorTitle"
-		tools:text="@string/qr_code_unsupported"/>
+		tools:text="@string/qr_code_unsupported" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
index 2fdf2a796..3e18f40b1 100644
--- a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -21,32 +20,32 @@
 			android:textSize="@dimen/text_size_large"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/errorIcon"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
 			android:layout_marginTop="16dp"
+			android:layout_marginRight="16dp"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_error"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/errorTitle"
 			app:tint="?attr/colorControlNormal"
-			tools:ignore="ContentDescription"/>
+			tools:ignore="ContentDescription" />
 
 		<TextView
 			android:id="@+id/errorMessage"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
 			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
 			android:layout_marginTop="8dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_medium"
 			app:layout_constraintBottom_toTopOf="@+id/sendFeedback"
@@ -55,55 +54,55 @@
 			app:layout_constraintTop_toBottomOf="@+id/errorIcon"
 			app:layout_constraintVertical_bias="0"
 			app:layout_constraintVertical_chainStyle="packed"
-			tools:text="@string/connection_error_explanation"/>
+			tools:text="@string/connection_error_explanation" />
 
 		<TextView
 			android:id="@+id/sendFeedback"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
 			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
 			android:layout_marginTop="8dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
 			android:text="@string/connection_error_feedback"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_medium"
 			app:layout_constraintBottom_toTopOf="@+id/tryAgainButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/errorMessage"/>
+			app:layout_constraintTop_toBottomOf="@+id/errorMessage" />
 
 		<Button
 			android:id="@+id/tryAgainButton"
 			style="@style/BriarButtonFlat.Positive"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="8dp"
 			android:layout_marginEnd="8dp"
 			android:layout_marginRight="8dp"
+			android:layout_marginBottom="8dp"
 			android:text="@string/try_again_button"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_weight="1"
-			app:layout_constraintStart_toEndOf="@+id/cancelButton"/>
+			app:layout_constraintStart_toEndOf="@+id/cancelButton" />
 
 		<Button
 			android:id="@+id/cancelButton"
 			style="@style/BriarButtonFlat.Negative"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="8dp"
-			android:layout_marginEnd="8dp"
-			android:layout_marginLeft="8dp"
-			android:layout_marginRight="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
+			android:layout_marginEnd="8dp"
+			android:layout_marginRight="8dp"
+			android:layout_marginBottom="8dp"
 			android:text="@string/cancel"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toStartOf="@+id/tryAgainButton"
 			app:layout_constraintHorizontal_chainStyle="spread"
 			app:layout_constraintHorizontal_weight="1"
-			app:layout_constraintStart_toStartOf="parent"/>
+			app:layout_constraintStart_toStartOf="parent" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_forum_list.xml b/briar-android/src/main/res/layout/fragment_forum_list.xml
index 2a34c3e78..b4351eae1 100644
--- a/briar-android/src/main/res/layout/fragment_forum_list.xml
+++ b/briar-android/src/main/res/layout/fragment_forum_list.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	android:id="@+id/forumList"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.BriarRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/forumList"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:emptyAction="@string/no_forums_action"
 	app:emptyImage="@drawable/ic_empty_state_forum_list"
 	app:emptyText="@string/no_forums"
-	app:layout_behavior="org.briarproject.briar.android.view.BriarRecyclerViewBehavior"/>
+	app:layout_behavior="org.briarproject.briar.android.view.BriarRecyclerViewBehavior" />
diff --git a/briar-android/src/main/res/layout/fragment_image.xml b/briar-android/src/main/res/layout/fragment_image.xml
index 2da926ea9..a988c1cdc 100644
--- a/briar-android/src/main/res/layout/fragment_image.xml
+++ b/briar-android/src/main/res/layout/fragment_image.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.github.chrisbanes.photoview.PhotoView
-	android:id="@+id/photoView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<com.github.chrisbanes.photoview.PhotoView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/photoView"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:ignore="ContentDescription"
-	tools:srcCompat="@tools:sample/backgrounds/scenic"/>
+	tools:srcCompat="@tools:sample/backgrounds/scenic" />
diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
index eae36a427..d72c5c55c 100644
--- a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	android:id="@+id/scrollView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/scrollView"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
@@ -25,7 +24,7 @@
 			app:layout_constraintBottom_toTopOf="@id/explanationImage"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<ImageView
 			android:id="@+id/explanationImage"
@@ -33,15 +32,15 @@
 			android:layout_height="wrap_content"
 			android:adjustViewBounds="true"
 			android:paddingLeft="@dimen/margin_large"
-			android:paddingRight="@dimen/margin_large"
 			android:paddingTop="@dimen/margin_large"
+			android:paddingRight="@dimen/margin_large"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_explanation"
 			app:layout_constraintBottom_toTopOf="@id/explanationText"
 			app:layout_constraintEnd_toEndOf="@id/diagram"
 			app:layout_constraintStart_toStartOf="@id/diagram"
 			app:layout_constraintTop_toBottomOf="@id/diagram"
-			tools:ignore="ContentDescription"/>
+			tools:ignore="ContentDescription" />
 
 		<TextView
 			android:id="@+id/explanationText"
@@ -52,7 +51,7 @@
 			app:layout_constrainedWidth="true"
 			app:layout_constraintEnd_toEndOf="@id/explanationImage"
 			app:layout_constraintStart_toStartOf="@id/explanationImage"
-			app:layout_constraintTop_toBottomOf="@id/explanationImage"/>
+			app:layout_constraintTop_toBottomOf="@id/explanationImage" />
 
 		<View
 			android:id="@+id/explanationBorder"
@@ -62,7 +61,7 @@
 			app:layout_constraintBottom_toBottomOf="@id/explanationText"
 			app:layout_constraintEnd_toEndOf="@id/explanationImage"
 			app:layout_constraintStart_toStartOf="@id/explanationImage"
-			app:layout_constraintTop_toTopOf="@id/explanationImage"/>
+			app:layout_constraintTop_toTopOf="@id/explanationImage" />
 
 		<Button
 			android:id="@+id/continueButton"
@@ -74,7 +73,7 @@
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="@id/explanationImage"
 			app:layout_constraintStart_toStartOf="@id/explanationImage"
-			app:layout_constraintTop_toBottomOf="@id/explanationText"/>
+			app:layout_constraintTop_toBottomOf="@id/explanationText" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
index b267079be..33227017d 100644
--- a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -9,7 +8,7 @@
 	<org.briarproject.briar.android.keyagreement.CameraView
 		android:id="@+id/camera_view"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"/>
+		android:layout_height="match_parent" />
 
 	<LinearLayout
 		android:id="@+id/camera_overlay"
@@ -32,7 +31,7 @@
 			<ProgressBar
 				style="?android:attr/progressBarStyleLarge"
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
+				android:layout_height="wrap_content" />
 
 			<TextView
 				android:id="@+id/connect_status"
@@ -40,7 +39,7 @@
 				android:layout_height="wrap_content"
 				android:gravity="center"
 				android:paddingTop="@dimen/margin_large"
-				tools:text="@string/waiting_for_contact_to_scan"/>
+				tools:text="@string/waiting_for_contact_to_scan" />
 		</LinearLayout>
 
 		<org.briarproject.briar.android.view.QrCodeView
@@ -49,7 +48,7 @@
 			android:layout_height="0dp"
 			android:layout_weight="1"
 			android:background="@android:color/white"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 	</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_link_dialog.xml b/briar-android/src/main/res/layout/fragment_link_dialog.xml
index 6cf3097e1..7199bbc14 100644
--- a/briar-android/src/main/res/layout/fragment_link_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_link_dialog.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,11 +9,11 @@
 		android:id="@+id/linkWarning"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		android:text="@string/link_warning_title"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_large"
@@ -24,17 +23,17 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0.0"
-		app:layout_constraintVertical_chainStyle="packed"/>
+		app:layout_constraintVertical_chainStyle="packed" />
 
 	<ScrollView
 		android:id="@+id/scrollView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		app:layout_constrainedHeight="true"
 		app:layout_constraintBottom_toTopOf="@+id/cancelButton"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -52,22 +51,22 @@
 				android:layout_height="wrap_content"
 				android:text="@string/link_warning_intro"
 				android:textColor="?android:attr/textColorPrimary"
-				android:textSize="@dimen/text_size_medium"/>
+				android:textSize="@dimen/text_size_medium" />
 
 			<TextView
 				android:id="@+id/urlView"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_vertical"
-				android:layout_marginBottom="16dp"
 				android:layout_marginTop="16dp"
+				android:layout_marginBottom="16dp"
 				android:background="@color/briar_white"
 				android:padding="8dp"
 				android:textColor="@color/briar_text_primary"
 				android:textIsSelectable="true"
 				android:textSize="@dimen/text_size_medium"
 				android:typeface="monospace"
-				tools:text="http://very.bad.site.com/with/a/super/long/address/that/can/push/stuff/off/screen/so/much/that/buttons/are/not/visible/which/is/bad/for/users/when/they/dont/know/what/to/do/they/might/be/completely/lost/crying/in/despair/so/we/need/to/make/sure/that/they/see/all/buttons"/>
+				tools:text="http://very.bad.site.com/with/a/super/long/address/that/can/push/stuff/off/screen/so/much/that/buttons/are/not/visible/which/is/bad/for/users/when/they/dont/know/what/to/do/they/might/be/completely/lost/crying/in/despair/so/we/need/to/make/sure/that/they/see/all/buttons" />
 
 			<TextView
 				android:id="@+id/thinkBeforeOpen"
@@ -75,7 +74,7 @@
 				android:layout_height="wrap_content"
 				android:text="@string/link_warning_text"
 				android:textColor="?android:attr/textColorPrimary"
-				android:textSize="@dimen/text_size_medium"/>
+				android:textSize="@dimen/text_size_medium" />
 
 		</LinearLayout>
 
@@ -93,7 +92,7 @@
 		app:layout_constraintHorizontal_chainStyle="packed"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/scrollView"
-		app:layout_constraintVertical_bias="1.0"/>
+		app:layout_constraintVertical_bias="1.0" />
 
 	<Button
 		android:id="@+id/openButton"
@@ -104,6 +103,6 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/cancelButton"
-		app:layout_constraintTop_toTopOf="@+id/cancelButton"/>
+		app:layout_constraintTop_toTopOf="@+id/cancelButton" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml
index 1a97d49b2..857c85721 100644
--- a/briar-android/src/main/res/layout/fragment_link_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -17,7 +16,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			app:layout_constraintGuide_percent="0.5"/>
+			app:layout_constraintGuide_percent="0.5" />
 
 		<TextView
 			android:id="@+id/stepOne"
@@ -27,7 +26,7 @@
 			app:layout_constraintEnd_toStartOf="@+id/guideline"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintVertical_bias="0.0"/>
+			app:layout_constraintVertical_bias="0.0" />
 
 		<TextView
 			android:id="@+id/stepOneText"
@@ -38,7 +37,7 @@
 			app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
 			app:layout_constraintEnd_toStartOf="@+id/guideline"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/stepOne"/>
+			app:layout_constraintTop_toBottomOf="@+id/stepOne" />
 
 		<View
 			android:id="@+id/stepConnector"
@@ -50,7 +49,7 @@
 			app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 			app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 			app:layout_constraintStart_toEndOf="@+id/stepOne"
-			app:layout_constraintTop_toTopOf="@+id/stepOne"/>
+			app:layout_constraintTop_toTopOf="@+id/stepOne" />
 
 		<TextView
 			android:id="@+id/stepTwo"
@@ -61,7 +60,7 @@
 			app:layout_constraintStart_toStartOf="@+id/guideline"
 			app:layout_constraintTop_toTopOf="@+id/stepOne"
 			app:layout_constraintVertical_bias="0.0"
-			app:layout_constraintVertical_chainStyle="packed"/>
+			app:layout_constraintVertical_chainStyle="packed" />
 
 		<TextView
 			android:id="@+id/stepTwoText"
@@ -73,7 +72,7 @@
 			app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@+id/guideline"
-			app:layout_constraintTop_toBottomOf="@+id/stepTwo"/>
+			app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/yourLinkIcon"
@@ -85,21 +84,21 @@
 			android:src="@drawable/ic_call_made"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/stepOneText"
-			app:tint="@color/briar_white"/>
+			app:tint="@color/briar_white" />
 
 		<TextView
 			android:id="@+id/yourLink"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
 			android:gravity="left|start"
 			android:text="@string/your_link"
 			android:textSize="16sp"
 			app:layout_constraintBottom_toBottomOf="@+id/yourLinkIcon"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@+id/yourLinkIcon"
-			app:layout_constraintTop_toTopOf="@+id/yourLinkIcon"/>
+			app:layout_constraintTop_toTopOf="@+id/yourLinkIcon" />
 
 		<TextView
 			android:id="@+id/linkView"
@@ -117,39 +116,39 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/yourLinkIcon"
-			tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv"/>
+			tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv" />
 
 		<Button
 			android:id="@+id/copyButton"
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:drawableStart="@drawable/ic_content_copy"
 			android:drawableLeft="@drawable/ic_content_copy"
 			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_content_copy"
 			android:enabled="false"
 			android:text="@string/copy_button"
 			app:layout_constraintEnd_toStartOf="@id/shareButton"
 			app:layout_constraintHorizontal_bias="1.0"
 			app:layout_constraintHorizontal_chainStyle="packed"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/linkView"/>
+			app:layout_constraintTop_toBottomOf="@+id/linkView" />
 
 		<Button
 			android:id="@+id/shareButton"
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:drawableStart="@drawable/social_share_blue"
 			android:drawableLeft="@drawable/social_share_blue"
 			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/social_share_blue"
 			android:enabled="false"
 			android:text="@string/share_button"
 			app:layout_constraintBottom_toBottomOf="@id/copyButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="1.0"
 			app:layout_constraintStart_toEndOf="@id/copyButton"
-			app:layout_constraintTop_toTopOf="@id/copyButton"/>
+			app:layout_constraintTop_toTopOf="@id/copyButton" />
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/linkInputIcon"
@@ -161,21 +160,21 @@
 			android:src="@drawable/ic_call_received"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/copyButton"
-			app:tint="@color/briar_white"/>
+			app:tint="@color/briar_white" />
 
 		<TextView
 			android:id="@+id/inputLink"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
 			android:gravity="left|start"
 			android:text="@string/contact_link_intro"
 			android:textSize="16sp"
 			app:layout_constraintBottom_toBottomOf="@+id/linkInputIcon"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@+id/linkInputIcon"
-			app:layout_constraintTop_toTopOf="@+id/linkInputIcon"/>
+			app:layout_constraintTop_toTopOf="@+id/linkInputIcon" />
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/linkInputLayout"
@@ -194,7 +193,7 @@
 				android:layout_height="match_parent"
 				android:hint="@string/contact_link_hint"
 				android:importantForAutofill="no"
-				android:inputType="textUri"/>
+				android:inputType="textUri" />
 
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -203,15 +202,15 @@
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:drawableStart="@drawable/ic_content_paste"
 			android:drawableLeft="@drawable/ic_content_paste"
 			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_content_paste"
 			android:text="@string/paste_button"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="1.0"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"
-			app:layout_constraintVertical_bias="0.0"/>
+			app:layout_constraintVertical_bias="0.0" />
 
 		<Button
 			android:id="@+id/addButton"
@@ -227,7 +226,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/pasteButton"
 			app:layout_constraintVertical_bias="1.0"
-			tools:enabled="true"/>
+			tools:enabled="true" />
 
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/fragment_message.xml b/briar-android/src/main/res/layout/fragment_message.xml
index b9061e7ef..a1c0df5be 100644
--- a/briar-android/src/main/res/layout/fragment_message.xml
+++ b/briar-android/src/main/res/layout/fragment_message.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.LargeTextInputView
-	android:id="@+id/messageView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.LargeTextInputView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/messageView"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:allowEmptyText="true"
 	app:buttonText="@string/forum_share_button"
 	app:fillHeight="true"
-	app:hint="@string/forum_share_message"/>
\ No newline at end of file
+	app:hint="@string/forum_share_message" />
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_nickname.xml b/briar-android/src/main/res/layout/fragment_nickname.xml
index 513093d7e..237ceff1d 100644
--- a/briar-android/src/main/res/layout/fragment_nickname.xml
+++ b/briar-android/src/main/res/layout/fragment_nickname.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -17,7 +16,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			app:layout_constraintGuide_percent="0.5"/>
+			app:layout_constraintGuide_percent="0.5" />
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/stepOne"
@@ -27,7 +26,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_bias="0.0"
-			app:layout_constraintVertical_chainStyle="packed"/>
+			app:layout_constraintVertical_chainStyle="packed" />
 
 		<TextView
 			android:id="@+id/stepOneText"
@@ -38,7 +37,7 @@
 			app:layout_constraintBottom_toTopOf="@+id/imageView"
 			app:layout_constraintEnd_toStartOf="@+id/guideline"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/stepOne"/>
+			app:layout_constraintTop_toBottomOf="@+id/stepOne" />
 
 		<View
 			android:id="@+id/stepConnector"
@@ -49,7 +48,7 @@
 			app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 			app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 			app:layout_constraintStart_toEndOf="@+id/stepOne"
-			app:layout_constraintTop_toTopOf="@+id/stepOne"/>
+			app:layout_constraintTop_toTopOf="@+id/stepOne" />
 
 		<TextView
 			android:id="@+id/stepTwo"
@@ -60,7 +59,7 @@
 			app:layout_constraintStart_toStartOf="@+id/guideline"
 			app:layout_constraintTop_toTopOf="@+id/stepOne"
 			app:layout_constraintVertical_bias="0.0"
-			app:layout_constraintVertical_chainStyle="packed"/>
+			app:layout_constraintVertical_chainStyle="packed" />
 
 		<TextView
 			android:id="@+id/stepTwoText"
@@ -71,7 +70,7 @@
 			app:layout_constraintBottom_toTopOf="@+id/imageView"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@+id/guideline"
-			app:layout_constraintTop_toBottomOf="@+id/stepTwo"/>
+			app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
 
 		<ImageView
 			android:id="@+id/imageView"
@@ -85,7 +84,7 @@
 			app:layout_constraintHeight_max="256dp"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/stepOneText"
-			tools:ignore="ContentDescription"/>
+			tools:ignore="ContentDescription" />
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/nicknameIcon"
@@ -98,21 +97,21 @@
 			app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/imageView"
-			app:tint="@color/briar_white"/>
+			app:tint="@color/briar_white" />
 
 		<TextView
 			android:id="@+id/nicknameIntro"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
 			android:gravity="left|start"
 			android:text="@string/nickname_intro"
 			android:textSize="16sp"
 			app:layout_constraintBottom_toBottomOf="@+id/nicknameIcon"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@+id/nicknameIcon"
-			app:layout_constraintTop_toTopOf="@+id/nicknameIcon"/>
+			app:layout_constraintTop_toTopOf="@+id/nicknameIcon" />
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/contactNameLayout"
@@ -133,7 +132,7 @@
 				android:layout_height="match_parent"
 				android:hint="@string/add_contact_choose_a_nickname"
 				android:importantForAutofill="no"
-				android:inputType="text|textCapWords"/>
+				android:inputType="text|textCapWords" />
 
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -145,7 +144,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHeight_default="wrap"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"/>
+			app:layout_constraintTop_toBottomOf="@+id/contactNameLayout" />
 
 		<Button
 			android:id="@+id/addButton"
@@ -157,7 +156,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"
-			app:layout_constraintVertical_bias="1.0"/>
+			app:layout_constraintVertical_bias="1.0" />
 
 		<ProgressBar
 			android:id="@+id/progressBar"
@@ -170,7 +169,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"
-			app:layout_constraintVertical_bias="1.0"/>
+			app:layout_constraintVertical_bias="1.0" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_open_database.xml b/briar-android/src/main/res/layout/fragment_open_database.xml
index bc20dc2f1..1d7dba9e4 100644
--- a/briar-android/src/main/res/layout/fragment_open_database.xml
+++ b/briar-android/src/main/res/layout/fragment_open_database.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -19,7 +18,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0.5"
 		app:layout_constraintVertical_chainStyle="packed"
-		tools:ignore="ContentDescription"/>
+		tools:ignore="ContentDescription" />
 
 	<ProgressBar
 		android:id="@+id/progressBar"
@@ -29,7 +28,7 @@
 		app:layout_constraintBottom_toBottomOf="@+id/imageView"
 		app:layout_constraintEnd_toEndOf="@+id/imageView"
 		app:layout_constraintStart_toStartOf="@+id/imageView"
-		app:layout_constraintTop_toTopOf="@+id/imageView"/>
+		app:layout_constraintTop_toTopOf="@+id/imageView" />
 
 	<TextView
 		android:id="@+id/textView"
@@ -44,6 +43,6 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView"/>
+		app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_password.xml b/briar-android/src/main/res/layout/fragment_password.xml
index ba105b9b0..484c53f52 100644
--- a/briar-android/src/main/res/layout/fragment_password.xml
+++ b/briar-android/src/main/res/layout/fragment_password.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -30,9 +29,9 @@
 				android:hint="@string/enter_password"
 				android:imeOptions="actionDone"
 				android:inputType="textPassword"
-				android:maxLines="1"/>
+				android:maxLines="1" />
 
-			<requestFocus/>
+			<requestFocus />
 
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -45,7 +44,7 @@
 			android:text="@string/sign_in_button"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/password_layout"/>
+			app:layout_constraintTop_toBottomOf="@id/password_layout" />
 
 		<ProgressBar
 			android:id="@+id/progress_wheel"
@@ -55,7 +54,7 @@
 			app:layout_constraintBottom_toBottomOf="@+id/btn_sign_in"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="@id/btn_sign_in"/>
+			app:layout_constraintTop_toTopOf="@id/btn_sign_in" />
 
 		<TextView
 			android:id="@+id/btn_forgotten"
@@ -68,7 +67,7 @@
 			android:textColor="?android:attr/textColorLink"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/btn_sign_in"/>
+			app:layout_constraintTop_toBottomOf="@id/btn_sign_in" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_reblog.xml b/briar-android/src/main/res/layout/fragment_reblog.xml
index 2cfa7e5f5..bc67e4b29 100644
--- a/briar-android/src/main/res/layout/fragment_reblog.xml
+++ b/briar-android/src/main/res/layout/fragment_reblog.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
@@ -21,14 +20,14 @@
 				layout="@layout/list_item_blog_post"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/margin_small"/>
+				android:layout_margin="@dimen/margin_small" />
 
 			<ProgressBar
 				android:id="@+id/progressBar"
 				style="?android:attr/progressBarStyleLarge"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_centerInParent="true"/>
+				android:layout_centerInParent="true" />
 
 		</RelativeLayout>
 
@@ -42,6 +41,6 @@
 		app:allowEmptyText="true"
 		app:buttonText="@string/blogs_reblog_button"
 		app:hint="@string/blogs_reblog_comment_hint"
-		app:maxLines="5"/>
+		app:maxLines="5" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_report_form.xml b/briar-android/src/main/res/layout/fragment_report_form.xml
index 109d12da1..cbff42b61 100644
--- a/briar-android/src/main/res/layout/fragment_report_form.xml
+++ b/briar-android/src/main/res/layout/fragment_report_form.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -15,11 +14,11 @@
 			android:id="@+id/user_comment_layout"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginTop="@dimen/margin_large"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			app:hintEnabled="false"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
@@ -31,7 +30,7 @@
 				android:layout_height="wrap_content"
 				android:inputType="textMultiLine|textCapSentences"
 				android:maxLines="5"
-				tools:hint="@string/describe_crash"/>
+				tools:hint="@string/describe_crash" />
 
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -39,10 +38,10 @@
 			android:id="@+id/user_email_layout"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			app:hintEnabled="false"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
@@ -54,7 +53,7 @@
 				android:layout_height="wrap_content"
 				android:hint="@string/optional_contact_email"
 				android:inputType="textEmailAddress"
-				android:maxLines="1"/>
+				android:maxLines="1" />
 
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -62,14 +61,14 @@
 			android:id="@+id/include_debug_report"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:checked="false"
 			android:text="@string/include_debug_report_crash"
 			app:layout_constraintBottom_toBottomOf="@+id/chevron"
 			app:layout_constraintEnd_toStartOf="@+id/chevron"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="@+id/chevron"/>
+			app:layout_constraintTop_toTopOf="@+id/chevron" />
 
 		<Button
 			android:id="@+id/chevron"
@@ -78,7 +77,7 @@
 			android:layout_height="wrap_content"
 			android:text="@string/show"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/user_email_layout"/>
+			app:layout_constraintTop_toBottomOf="@+id/user_email_layout" />
 
 		<LinearLayout
 			android:id="@+id/report_content"
@@ -86,14 +85,14 @@
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
 			android:orientation="vertical"
-			android:paddingBottom="@dimen/listitem_height_one_line_avatar"
-			android:paddingEnd="@dimen/margin_large"
 			android:paddingStart="@dimen/margin_large"
 			android:paddingTop="@dimen/margin_small"
+			android:paddingEnd="@dimen/margin_large"
+			android:paddingBottom="@dimen/listitem_height_one_line_avatar"
 			android:visibility="gone"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/include_debug_report"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<ProgressBar
 			android:id="@+id/progress_wheel"
@@ -106,7 +105,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/include_debug_report"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_setup_author_name.xml b/briar-android/src/main/res/layout/fragment_setup_author_name.xml
index 18b5887df..2b644cd45 100644
--- a/briar-android/src/main/res/layout/fragment_setup_author_name.xml
+++ b/briar-android/src/main/res/layout/fragment_setup_author_name.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,12 +9,12 @@
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingBottom="@dimen/margin_activity_vertical"
-		android:paddingEnd="@dimen/margin_activity_horizontal"
-		android:paddingLeft="@dimen/margin_activity_horizontal"
-		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingStart="@dimen/margin_activity_horizontal"
-		android:paddingTop="@dimen/margin_activity_vertical">
+		android:paddingLeft="@dimen/margin_activity_horizontal"
+		android:paddingTop="@dimen/margin_activity_vertical"
+		android:paddingEnd="@dimen/margin_activity_horizontal"
+		android:paddingRight="@dimen/margin_activity_horizontal"
+		android:paddingBottom="@dimen/margin_activity_vertical">
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/nickname_entry_wrapper"
@@ -35,9 +34,9 @@
 				android:hint="@string/choose_nickname"
 				android:imeOptions="actionNext"
 				android:inputType="text|textCapWords"
-				android:maxLines="1"/>
+				android:maxLines="1" />
 
-			<requestFocus/>
+			<requestFocus />
 
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -54,7 +53,7 @@
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/nickname_entry_wrapper"
 			app:layout_constraintVertical_bias="1.0"
-			tools:enabled="true"/>
+			tools:enabled="true" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_setup_doze.xml b/briar-android/src/main/res/layout/fragment_setup_doze.xml
index cbef39f79..0a5c03f14 100644
--- a/briar-android/src/main/res/layout/fragment_setup_doze.xml
+++ b/briar-android/src/main/res/layout/fragment_setup_doze.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -18,7 +17,7 @@
 			android:layout_height="wrap_content"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<org.briarproject.briar.android.account.HuaweiView
 			android:id="@+id/huaweiView"
@@ -26,7 +25,7 @@
 			android:layout_height="wrap_content"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/dozeView"/>
+			app:layout_constraintTop_toBottomOf="@+id/dozeView" />
 
 		<Button
 			android:id="@+id/next"
@@ -40,7 +39,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/huaweiView"
 			app:layout_constraintVertical_bias="1.0"
-			tools:enabled="true"/>
+			tools:enabled="true" />
 
 		<ProgressBar
 			android:id="@+id/progress"
@@ -51,7 +50,7 @@
 			app:layout_constraintBottom_toBottomOf="@+id/next"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="@+id/next"/>
+			app:layout_constraintTop_toTopOf="@+id/next" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_setup_password.xml b/briar-android/src/main/res/layout/fragment_setup_password.xml
index 0447979c9..1f8dc05f9 100644
--- a/briar-android/src/main/res/layout/fragment_setup_password.xml
+++ b/briar-android/src/main/res/layout/fragment_setup_password.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,12 +9,12 @@
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingBottom="@dimen/margin_activity_vertical"
-		android:paddingEnd="@dimen/margin_activity_horizontal"
-		android:paddingLeft="@dimen/margin_activity_horizontal"
-		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingStart="@dimen/margin_activity_horizontal"
-		android:paddingTop="@dimen/margin_activity_vertical">
+		android:paddingLeft="@dimen/margin_activity_horizontal"
+		android:paddingTop="@dimen/margin_activity_vertical"
+		android:paddingEnd="@dimen/margin_activity_horizontal"
+		android:paddingRight="@dimen/margin_activity_horizontal"
+		android:paddingBottom="@dimen/margin_activity_vertical">
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/password_entry_wrapper"
@@ -38,7 +37,7 @@
 				android:inputType="textPassword"
 				android:maxLines="1">
 
-				<requestFocus/>
+				<requestFocus />
 
 			</com.google.android.material.textfield.TextInputEditText>
 
@@ -53,7 +52,7 @@
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/password_entry_wrapper"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/password_confirm_wrapper"
@@ -74,7 +73,7 @@
 				android:hint="@string/confirm_password"
 				android:imeOptions="actionNext"
 				android:inputType="textPassword"
-				android:maxLines="1"/>
+				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<Button
@@ -89,7 +88,7 @@
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/password_confirm_wrapper"
 			app:layout_constraintVertical_bias="1.0"
-			tools:enabled="true"/>
+			tools:enabled="true" />
 
 		<ProgressBar
 			android:id="@+id/progress"
@@ -101,7 +100,7 @@
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/password_confirm_wrapper"
-			app:layout_constraintVertical_bias="1.0"/>
+			app:layout_constraintVertical_bias="1.0" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_sign_out.xml b/briar-android/src/main/res/layout/fragment_sign_out.xml
index abc3de2ee..09d8137ff 100644
--- a/briar-android/src/main/res/layout/fragment_sign_out.xml
+++ b/briar-android/src/main/res/layout/fragment_sign_out.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -19,7 +18,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0.5"
 		app:layout_constraintVertical_chainStyle="packed"
-		tools:ignore="ContentDescription"/>
+		tools:ignore="ContentDescription" />
 
 	<ProgressBar
 		android:id="@+id/progressBar"
@@ -29,7 +28,7 @@
 		app:layout_constraintBottom_toBottomOf="@+id/imageView"
 		app:layout_constraintEnd_toEndOf="@+id/imageView"
 		app:layout_constraintStart_toStartOf="@+id/imageView"
-		app:layout_constraintTop_toTopOf="@+id/imageView"/>
+		app:layout_constraintTop_toTopOf="@+id/imageView" />
 
 	<TextView
 		android:id="@+id/textView"
@@ -41,6 +40,6 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView"/>
+		app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/image_preview.xml b/briar-android/src/main/res/layout/image_preview.xml
index 70d85b55e..d33a73ca9 100644
--- a/briar-android/src/main/res/layout/image_preview.xml
+++ b/briar-android/src/main/res/layout/image_preview.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -16,7 +15,7 @@
 		app:layout_constraintBottom_toTopOf="@+id/imageList"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/imageList"
@@ -29,16 +28,16 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/divider"
 		tools:ignore="ContentDescription"
-		tools:listitem="@layout/list_item_image"/>
+		tools:listitem="@layout/list_item_image" />
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/imageCancelButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="8dp"
+		android:layout_marginTop="8dp"
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
-		android:layout_marginTop="8dp"
+		android:layout_marginBottom="8dp"
 		android:src="@drawable/ic_close"
 		app:backgroundTint="@color/briar_red"
 		app:fabCustomSize="26dp"
@@ -46,6 +45,6 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0"
-		app:maxImageSize="18dp"/>
+		app:maxImageSize="18dp" />
 
 </merge>
diff --git a/briar-android/src/main/res/layout/introduction_message.xml b/briar-android/src/main/res/layout/introduction_message.xml
index 15bc6c54e..99a2e980a 100644
--- a/briar-android/src/main/res/layout/introduction_message.xml
+++ b/briar-android/src/main/res/layout/introduction_message.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -20,24 +19,24 @@
 			app:layout_constraintEnd_toStartOf="@+id/introductionIcon"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:src="@mipmap/ic_launcher_round"/>
+			tools:src="@mipmap/ic_launcher_round" />
 
 		<com.vanniktech.emoji.EmojiTextView
 			android:id="@+id/nameContact1"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginTop="@dimen/margin_medium"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			android:gravity="center"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_small"
 			app:layout_constraintEnd_toStartOf="@+id/introductionIcon"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/avatarContact1"
-			tools:text="Contact 1"/>
+			tools:text="Contact 1" />
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/introductionIcon"
@@ -50,7 +49,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="@+id/avatarContact2"
 			app:tint="?attr/colorControlNormal"
-			tools:ignore="ContentDescription"/>
+			tools:ignore="ContentDescription" />
 
 		<de.hdodenhof.circleimageview.CircleImageView
 			android:id="@+id/avatarContact2"
@@ -61,31 +60,31 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@+id/introductionIcon"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:src="@mipmap/ic_launcher_round"/>
+			tools:src="@mipmap/ic_launcher_round" />
 
 		<com.vanniktech.emoji.EmojiTextView
 			android:id="@+id/nameContact2"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginTop="@dimen/margin_medium"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			android:gravity="center"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_small"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@+id/introductionIcon"
 			app:layout_constraintTop_toBottomOf="@+id/avatarContact2"
-			tools:text="Contact 2 can have quite a long name"/>
+			tools:text="Contact 2 can have quite a long name" />
 
 		<androidx.constraintlayout.widget.Barrier
 			android:id="@+id/barrier"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			app:barrierDirection="bottom"
-			app:constraint_referenced_ids="nameContact1,nameContact2"/>
+			app:constraint_referenced_ids="nameContact1,nameContact2" />
 
 		<ProgressBar
 			android:id="@+id/progressBar"
@@ -97,7 +96,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="@+id/barrier"
-			tools:visibility="gone"/>
+			tools:visibility="gone" />
 
 		<TextView
 			android:id="@+id/introductionNotPossibleView"
@@ -110,7 +109,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/progressBar"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<org.briarproject.briar.android.view.LargeTextInputView
 			android:id="@+id/introductionMessageView"
@@ -126,7 +125,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/introductionNotPossibleView"
 			app:maxLines="5"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list.xml b/briar-android/src/main/res/layout/list.xml
index 8f7a01284..099c817dd 100644
--- a/briar-android/src/main/res/layout/list.xml
+++ b/briar-android/src/main/res/layout/list.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	android:id="@+id/list"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.BriarRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/list"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	app:scrollToEnd="false"/>
+	app:scrollToEnd="false" />
diff --git a/briar-android/src/main/res/layout/list_item_blog_comment.xml b/briar-android/src/main/res/layout/list_item_blog_comment.xml
index 5f7d5559a..b6bb9b702 100644
--- a/briar-android/src/main/res/layout/list_item_blog_comment.xml
+++ b/briar-android/src/main/res/layout/list_item_blog_comment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -11,7 +10,7 @@
 		android:id="@+id/inputDivider"
 		style="@style/Divider.Horizontal"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<org.briarproject.briar.android.view.AuthorView
 		android:id="@+id/authorView"
@@ -21,20 +20,20 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:persona="commenter"/>
+		app:persona="commenter" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:paddingBottom="@dimen/listitem_vertical_margin"
-		android:paddingEnd="@dimen/listitem_vertical_margin"
 		android:paddingStart="@dimen/listitem_vertical_margin"
+		android:paddingEnd="@dimen/listitem_vertical_margin"
+		android:paddingBottom="@dimen/listitem_vertical_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/authorView"
-		tools:text="This is a comment that appears below a blog post. Usually, it is expected to be rather short. Not much longer than this one."/>
+		tools:text="This is a comment that appears below a blog post. Usually, it is expected to be rather short. Not much longer than this one." />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_blog_post.xml b/briar-android/src/main/res/layout/list_item_blog_post.xml
index 28c220271..293b69ae3 100644
--- a/briar-android/src/main/res/layout/list_item_blog_post.xml
+++ b/briar-android/src/main/res/layout/list_item_blog_post.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-	android:id="@+id/postLayout"
-	style="@style/BriarCard"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/postLayout"
+	style="@style/BriarCard"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:foreground="?attr/selectableItemBackground">
@@ -17,30 +16,30 @@
 			android:id="@+id/rebloggerView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-			android:layout_marginEnd="@dimen/listitem_vertical_margin"
-			android:layout_marginLeft="@dimen/listitem_vertical_margin"
-			android:layout_marginRight="@dimen/listitem_vertical_margin"
 			android:layout_marginStart="@dimen/listitem_vertical_margin"
+			android:layout_marginLeft="@dimen/listitem_vertical_margin"
 			android:layout_marginTop="@dimen/listitem_vertical_margin"
+			android:layout_marginEnd="@dimen/listitem_vertical_margin"
+			android:layout_marginRight="@dimen/listitem_vertical_margin"
+			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 			app:layout_constraintEnd_toStartOf="@+id/commentView"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			app:persona="reblogger"/>
+			app:persona="reblogger" />
 
 		<org.briarproject.briar.android.view.AuthorView
 			android:id="@+id/authorView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-			android:layout_marginEnd="@dimen/listitem_vertical_margin"
-			android:layout_marginLeft="@dimen/listitem_vertical_margin"
-			android:layout_marginRight="@dimen/listitem_vertical_margin"
 			android:layout_marginStart="@dimen/listitem_vertical_margin"
+			android:layout_marginLeft="@dimen/listitem_vertical_margin"
 			android:layout_marginTop="@dimen/listitem_vertical_margin"
+			android:layout_marginEnd="@dimen/listitem_vertical_margin"
+			android:layout_marginRight="@dimen/listitem_vertical_margin"
+			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 			app:layout_constraintEnd_toStartOf="@+id/commentView"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/rebloggerView"/>
+			app:layout_constraintTop_toBottomOf="@+id/rebloggerView" />
 
 		<androidx.appcompat.widget.AppCompatImageButton
 			android:id="@+id/commentView"
@@ -51,7 +50,7 @@
 			android:src="@drawable/ic_repeat"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			app:tint="?attr/colorControlNormal"/>
+			app:tint="?attr/colorControlNormal" />
 
 		<com.vanniktech.emoji.EmojiTextView
 			android:id="@+id/textView"
@@ -63,7 +62,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/authorView"
-			tools:text="This is a body text that shows the content of a blog post.\n\nThis one is not short, but it is also not too long."/>
+			tools:text="This is a body text that shows the content of a blog post.\n\nThis one is not short, but it is also not too long." />
 
 		<!-- TODO replace with RecyclerView -->
 		<LinearLayout
@@ -77,7 +76,7 @@
 			<include
 				layout="@layout/list_item_blog_comment"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
+				android:layout_height="wrap_content" />
 
 		</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_contact.xml b/briar-android/src/main/res/layout/list_item_contact.xml
index 69443aeb7..a59a0e8d2 100644
--- a/briar-android/src/main/res/layout/list_item_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_contact.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout4"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout4"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground"
@@ -25,7 +24,7 @@
 			android:layout_width="@dimen/listitem_picture_size"
 			android:layout_height="@dimen/listitem_picture_size"
 			android:layout_gravity="bottom|left|start"
-			tools:src="@mipmap/ic_launcher_round"/>
+			tools:src="@mipmap/ic_launcher_round" />
 
 	</FrameLayout>
 
@@ -41,19 +40,19 @@
 		android:textStyle="bold"
 		app:layout_constraintEnd_toEndOf="@+id/avatarFrameView"
 		app:layout_constraintTop_toTopOf="@+id/avatarFrameView"
-		tools:text="123"/>
+		tools:text="123" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/nameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/listitem_vertical_margin"
-		android:paddingEnd="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:paddingStart="@dimen/margin_medium"
+		android:paddingEnd="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintBottom_toTopOf="@+id/dateView"
@@ -61,26 +60,26 @@
 		app:layout_constraintStart_toEndOf="@+id/avatarFrameView"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed"
-		tools:text="This is a name of a contact"/>
+		tools:text="This is a name of a contact" />
 
 	<TextView
 		android:id="@+id/dateView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/listitem_vertical_margin"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
-		android:paddingEnd="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
+		android:layout_marginBottom="@dimen/listitem_vertical_margin"
 		android:paddingStart="@dimen/margin_medium"
+		android:paddingEnd="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintEnd_toStartOf="@+id/bulbView"
 		app:layout_constraintStart_toEndOf="@+id/avatarFrameView"
 		app:layout_constraintTop_toBottomOf="@+id/nameView"
-		tools:text="Dec 24"/>
+		tools:text="Dec 24" />
 
 	<ImageView
 		android:id="@+id/bulbView"
@@ -91,7 +90,7 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_connected"/>
+		tools:src="@drawable/contact_connected" />
 
 	<View
 		android:id="@+id/divider"
@@ -99,6 +98,6 @@
 		android:layout_width="0dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="@+id/nameView"/>
+		app:layout_constraintStart_toStartOf="@+id/nameView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_contact_small.xml b/briar-android/src/main/res/layout/list_item_contact_small.xml
index 538d414d0..4669b2e32 100644
--- a/briar-android/src/main/res/layout/list_item_contact_small.xml
+++ b/briar-android/src/main/res/layout/list_item_contact_small.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="horizontal"
-	android:paddingBottom="@dimen/margin_medium"
-	android:paddingTop="@dimen/margin_medium">
+	android:paddingTop="@dimen/margin_medium"
+	android:paddingBottom="@dimen/margin_medium">
 
 	<de.hdodenhof.circleimageview.CircleImageView
 		android:id="@+id/avatarView"
@@ -14,24 +13,24 @@
 		android:layout_width="@dimen/listitem_picture_size_small"
 		android:layout_height="@dimen/listitem_picture_size_small"
 		android:layout_gravity="center_vertical"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
-		tools:src="@mipmap/ic_launcher_round"/>
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+		tools:src="@mipmap/ic_launcher_round" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/nameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_weight="1"
 		android:maxLines="2"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
-		tools:text="This is a name of a contact"/>
+		tools:text="This is a name of a contact" />
 
 	<ImageView
 		android:id="@+id/bulbView"
@@ -41,6 +40,6 @@
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_connected"/>
+		tools:src="@drawable/contact_connected" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_image.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_image.xml
index 78e547315..020bca4b3 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_image.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_image.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/layout"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginStart="@dimen/message_bubble_margin_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
@@ -27,17 +26,17 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:spanCount="2"
 		tools:ignore="ContentDescription"
-		tools:listitem="@layout/list_item_image"/>
+		tools:listitem="@layout/list_item_image" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
 		style="@style/TextMessage"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:textColor="?android:attr/textColorPrimary"
 		android:visibility="gone"
 		app:layout_constrainedWidth="true"
@@ -46,15 +45,15 @@
 		app:layout_constraintHorizontal_bias="0.0"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/imageList"
-		tools:text="The text of a message which can sometimes be a bit longer as well"/>
+		tools:text="The text of a message which can sometimes be a bit longer as well" />
 
 	<LinearLayout
 		android:id="@+id/statusLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_top"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_top"
 		android:background="@drawable/msg_status_bubble"
 		android:orientation="horizontal"
 		app:layout_constraintBottom_toBottomOf="@+id/imageList"
@@ -67,7 +66,7 @@
 			style="@style/TextMessage.Timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			tools:text="Dec 24, 13:37"/>
+			tools:text="Dec 24, 13:37" />
 
 	</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_image_text.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_image_text.xml
index 34902fda4..27056a3da 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_image_text.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_image_text.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/layout"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginStart="@dimen/message_bubble_margin_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
@@ -27,17 +26,17 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:spanCount="2"
 		tools:ignore="ContentDescription"
-		tools:listitem="@layout/list_item_image"/>
+		tools:listitem="@layout/list_item_image" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
 		style="@style/TextMessage"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:textColor="?android:attr/textColorPrimary"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/statusLayout"
@@ -45,15 +44,15 @@
 		app:layout_constraintHorizontal_bias="0.0"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/imageList"
-		tools:text="The text of a message which can sometimes be a bit longer as well"/>
+		tools:text="The text of a message which can sometimes be a bit longer as well" />
 
 	<LinearLayout
 		android:id="@+id/statusLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:orientation="horizontal"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -66,7 +65,7 @@
 			style="@style/TextMessage.Timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			tools:text="Dec 24, 13:37"/>
+			tools:text="Dec 24, 13:37" />
 
 	</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
index 2cc9438a6..a92cf249c 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/layout"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginStart="@dimen/message_bubble_margin_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
@@ -28,17 +27,17 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:spanCount="2"
 		tools:ignore="ContentDescription"
-		tools:listitem="@layout/list_item_image"/>
+		tools:listitem="@layout/list_item_image" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
 		style="@style/TextMessage"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:textColor="?android:attr/textColorPrimary"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/statusLayout"
@@ -46,15 +45,15 @@
 		app:layout_constraintHorizontal_bias="0.0"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/imageList"
-		tools:text="The text of a message which can sometimes be a bit longer as well"/>
+		tools:text="The text of a message which can sometimes be a bit longer as well" />
 
 	<LinearLayout
 		android:id="@+id/statusLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:orientation="horizontal"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -67,7 +66,7 @@
 			style="@style/TextMessage.Timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			tools:text="Dec 24, 13:37"/>
+			tools:text="Dec 24, 13:37" />
 
 	</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
index 5631493e6..f77f9609b 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This is needed to right-align message bubble in RecyclerView -->
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!-- This is needed to right-align message bubble in RecyclerView -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -12,12 +10,12 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginTop="@dimen/message_bubble_margin"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/msg_out"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -34,17 +32,17 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:spanCount="2"
 			tools:ignore="ContentDescription"
-			tools:src="@drawable/alerts_and_states_error"/>
+			tools:src="@drawable/alerts_and_states_error" />
 
 		<com.vanniktech.emoji.EmojiTextView
 			android:id="@+id/text"
 			style="@style/TextMessage"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-			android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 			android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+			android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:textColor="@color/briar_text_primary_inverse"
 			app:layout_constrainedWidth="true"
 			app:layout_constraintBottom_toTopOf="@+id/statusLayout"
@@ -52,15 +50,15 @@
 			app:layout_constraintHorizontal_bias="0.0"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/imageList"
-			tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
+			tools:text="This is a long long long message that spans over several lines.\n\nIt ends here." />
 
 		<LinearLayout
 			android:id="@+id/statusLayout"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 			android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:orientation="horizontal"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
@@ -77,14 +75,14 @@
 				android:layout_marginEnd="6dp"
 				android:layout_marginRight="6dp"
 				android:textColor="@color/private_message_date_inverse"
-				tools:text="Dec 24, 13:37"/>
+				tools:text="Dec 24, 13:37" />
 
 			<ImageView
 				android:id="@+id/status"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				tools:ignore="ContentDescription"
-				tools:src="@drawable/message_delivered"/>
+				tools:src="@drawable/message_delivered" />
 
 		</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
index eebde17ce..689c9208c 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -13,23 +12,23 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
-		tools:text="Short message"/>
+		tools:text="Short message" />
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -40,7 +39,7 @@
 			android:layout_height="wrap_content"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:text="@string/forum_invitation_received"/>
+			tools:text="@string/forum_invitation_received" />
 
 		<TextView
 			android:id="@+id/time"
@@ -50,7 +49,7 @@
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
 			app:layout_constraintEnd_toEndOf="@+id/text"
 			app:layout_constraintTop_toBottomOf="@+id/text"
-			tools:text="Dec 24, 13:37"/>
+			tools:text="Dec 24, 13:37" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
index 0f49a6039..4ae737834 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -13,24 +12,24 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_out_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="@color/briar_text_primary_inverse"
-		tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
+		tools:text="This is a long long long message that spans over several lines.\n\nIt ends here." />
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/notice_out_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -42,7 +41,7 @@
 			android:textColor="@color/private_message_date_inverse"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:text="@string/introduction_request_received"/>
+			tools:text="@string/introduction_request_received" />
 
 		<TextView
 			android:id="@+id/time"
@@ -53,19 +52,19 @@
 			android:textColor="@color/private_message_date_inverse"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/text"
-			tools:text="Dec 24, 13:37"/>
+			tools:text="Dec 24, 13:37" />
 
 		<ImageView
 			android:id="@+id/status"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/margin_medium"
 			android:layout_marginStart="@dimen/margin_medium"
+			android:layout_marginLeft="@dimen/margin_medium"
 			app:layout_constraintBottom_toBottomOf="@+id/time"
 			app:layout_constraintStart_toEndOf="@+id/time"
 			app:layout_constraintTop_toTopOf="@+id/time"
 			tools:ignore="ContentDescription"
-			tools:src="@drawable/message_delivered"/>
+			tools:src="@drawable/message_delivered" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml
index ec57370a2..a1fbf33dd 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_request.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -13,24 +12,24 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="?android:attr/textColorPrimary"
-		tools:text="Short message"/>
+		tools:text="Short message" />
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -41,7 +40,7 @@
 			android:layout_height="wrap_content"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:text="@string/introduction_request_received"/>
+			tools:text="@string/introduction_request_received" />
 
 		<Button
 			android:id="@+id/acceptButton"
@@ -50,7 +49,7 @@
 			android:layout_height="wrap_content"
 			android:text="@string/accept"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/text"/>
+			app:layout_constraintTop_toBottomOf="@+id/text" />
 
 		<Button
 			android:id="@+id/declineButton"
@@ -60,7 +59,7 @@
 			android:text="@string/decline"
 			app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
 			app:layout_constraintEnd_toStartOf="@+id/acceptButton"
-			app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
+			app:layout_constraintTop_toTopOf="@+id/acceptButton" />
 
 		<TextView
 			android:id="@+id/time"
@@ -69,7 +68,7 @@
 			android:layout_height="wrap_content"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/acceptButton"
-			tools:text="Dec 24, 13:37"/>
+			tools:text="Dec 24, 13:37" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_crash.xml b/briar-android/src/main/res/layout/list_item_crash.xml
index 581931093..aa9c6250a 100644
--- a/briar-android/src/main/res/layout/list_item_crash.xml
+++ b/briar-android/src/main/res/layout/list_item_crash.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,14 +9,14 @@
 		android:id="@+id/include_in_report"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_large"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="Crash log entry title"/>
+		tools:text="Crash log entry title" />
 
 	<TextView
 		android:id="@+id/content"
@@ -28,6 +27,6 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/include_in_report"
-		tools:text="Crash log entry value"/>
+		tools:text="Crash log entry value" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_forum.xml b/briar-android/src/main/res/layout/list_item_forum.xml
index 86bcd3c53..c76ead606 100644
--- a/briar-android/src/main/res/layout/list_item_forum.xml
+++ b/briar-android/src/main/res/layout/list_item_forum.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -11,41 +10,41 @@
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/forumNameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="This is a name of a forum which can be long"/>
+		tools:text="This is a name of a forum which can be long" />
 
 	<TextView
 		android:id="@+id/postCountView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
-		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toStartOf="@+id/dateView"
 		app:layout_constraintStart_toStartOf="@+id/forumNameView"
 		app:layout_constraintTop_toBottomOf="@+id/forumNameView"
-		tools:text="@string/no_forum_posts"/>
+		tools:text="@string/no_forum_posts" />
 
 	<TextView
 		android:id="@+id/dateView"
@@ -57,18 +56,18 @@
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBaseline_toBaselineOf="@+id/postCountView"
 		app:layout_constraintEnd_toEndOf="parent"
-		tools:text="Dec 24"/>
+		tools:text="Dec 24" />
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
-		app:layout_constraintTop_toBottomOf="@id/postCountView"/>
+		app:layout_constraintTop_toBottomOf="@id/postCountView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_group.xml b/briar-android/src/main/res/layout/list_item_group.xml
index 4457bea46..01b88a1e8 100644
--- a/briar-android/src/main/res/layout/list_item_group.xml
+++ b/briar-android/src/main/res/layout/list_item_group.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -14,7 +13,7 @@
 		android:layout_margin="@dimen/listitem_horizontal_margin"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/nameView"
@@ -26,38 +25,38 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="This is a name of a Private Group which can be quite long actually"/>
+		tools:text="This is a name of a Private Group which can be quite long actually" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/creatorView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_small"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_marginTop="@dimen/margin_small"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="@+id/nameView"
 		app:layout_constraintTop_toBottomOf="@+id/nameView"
-		tools:text="Created by Santa Claus"/>
+		tools:text="Created by Santa Claus" />
 
 	<TextView
 		android:id="@+id/messageCountView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toStartOf="@+id/dateView"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toBottomOf="@+id/creatorView"
 		tools:text="1337 messages"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<TextView
 		android:id="@+id/dateView"
@@ -70,23 +69,23 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintRight_toRightOf="parent"
 		tools:text="3 weeks ago, 12:00"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<TextView
 		android:id="@+id/statusView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorTertiary"
 		app:layout_constraintEnd_toStartOf="@+id/removeButton"
 		app:layout_constraintLeft_toRightOf="@+id/avatarView"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toBottomOf="@+id/messageCountView"
-		tools:text="This group is empty, but has a long status text"/>
+		tools:text="This group is empty, but has a long status text" />
 
 	<Button
 		android:id="@+id/removeButton"
@@ -98,18 +97,18 @@
 		app:layout_constraintBottom_toBottomOf="@+id/divider"
 		app:layout_constraintRight_toRightOf="parent"
 		app:layout_constraintTop_toTopOf="@+id/statusView"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
-		app:layout_constraintTop_toBottomOf="@+id/statusView"/>
+		app:layout_constraintTop_toBottomOf="@+id/statusView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_group_join_notice.xml b/briar-android/src/main/res/layout/list_item_group_join_notice.xml
index e10126af1..fd61c2e9c 100644
--- a/briar-android/src/main/res/layout/list_item_group_join_notice.xml
+++ b/briar-android/src/main/res/layout/list_item_group_join_notice.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/layout"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="@drawable/list_item_thread_background">
@@ -12,7 +11,7 @@
 		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
 		app:layout_constraintLeft_toLeftOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<org.briarproject.briar.android.view.AuthorView
 		android:id="@+id/author"
@@ -22,7 +21,7 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/divider"
-		app:persona="commenter"/>
+		app:persona="commenter" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
@@ -34,6 +33,6 @@
 		android:textStyle="italic"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/author"
-		tools:text="@string/groups_member_joined"/>
+		tools:text="@string/groups_member_joined" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_group_member.xml b/briar-android/src/main/res/layout/list_item_group_member.xml
index 16cebe790..21946a4f0 100644
--- a/briar-android/src/main/res/layout/list_item_group_member.xml
+++ b/briar-android/src/main/res/layout/list_item_group_member.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -14,7 +13,7 @@
 		app:layout_constraintEnd_toStartOf="@+id/bulbView"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:persona="list"/>
+		app:persona="list" />
 
 	<ImageView
 		android:id="@+id/bulbView"
@@ -25,29 +24,29 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/contact_connected"/>
+		tools:src="@drawable/contact_connected" />
 
 	<TextView
 		android:id="@+id/creatorView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="40dp"
 		android:layout_marginStart="40dp"
+		android:layout_marginLeft="40dp"
 		android:layout_marginTop="@dimen/margin_small"
 		android:text="@string/groups_member_created_you"
 		android:textColor="?android:attr/textColorSecondary"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/authorView"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
-		android:layout_marginLeft="36dp"
 		android:layout_marginStart="36dp"
+		android:layout_marginLeft="36dp"
 		android:layout_marginTop="@dimen/margin_medium"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/creatorView"/>
+		app:layout_constraintTop_toBottomOf="@+id/creatorView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_image.xml b/briar-android/src/main/res/layout/list_item_image.xml
index 275d9df1d..2ece6ce0b 100644
--- a/briar-android/src/main/res/layout/list_item_image.xml
+++ b/briar-android/src/main/res/layout/list_item_image.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView
-	android:id="@+id/imageView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/imageView"
 	android:layout_width="@dimen/message_bubble_image_default"
 	android:layout_height="@dimen/message_bubble_image_default"
 	android:scaleType="centerCrop"
 	tools:ignore="ContentDescription"
-	tools:srcCompat="@tools:sample/avatars"/>
+	tools:srcCompat="@tools:sample/avatars" />
diff --git a/briar-android/src/main/res/layout/list_item_image_preview.xml b/briar-android/src/main/res/layout/list_item_image_preview.xml
index e107c5f84..03d789c3d 100644
--- a/briar-android/src/main/res/layout/list_item_image_preview.xml
+++ b/briar-android/src/main/res/layout/list_item_image_preview.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="wrap_content"
@@ -16,7 +15,7 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<ImageView
 		android:id="@+id/imageView"
@@ -30,6 +29,6 @@
 		app:layout_constraintTop_toTopOf="parent"
 		tools:ignore="ContentDescription"
 		tools:srcCompat="@tools:sample/avatars"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_image_preview_single.xml b/briar-android/src/main/res/layout/list_item_image_preview_single.xml
index fe226e0be..9fbdbd710 100644
--- a/briar-android/src/main/res/layout/list_item_image_preview_single.xml
+++ b/briar-android/src/main/res/layout/list_item_image_preview_single.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -16,7 +15,7 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<ImageView
 		android:id="@+id/imageView"
@@ -28,6 +27,6 @@
 		app:layout_constraintTop_toTopOf="parent"
 		tools:ignore="ContentDescription"
 		tools:srcCompat="@tools:sample/backgrounds/scenic"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_invitations.xml b/briar-android/src/main/res/layout/list_item_invitations.xml
index bd6b57218..d155185ef 100644
--- a/briar-android/src/main/res/layout/list_item_invitations.xml
+++ b/briar-android/src/main/res/layout/list_item_invitations.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -12,52 +11,52 @@
 		android:layout_height="@dimen/listitem_picture_frame_size"
 		android:layout_margin="@dimen/listitem_horizontal_margin"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/forumNameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_margin="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="This is a name of a forum that is available and has a long name"/>
+		tools:text="This is a name of a forum that is available and has a long name" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/sharedByView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="@+id/forumNameView"
 		app:layout_constraintTop_toBottomOf="@+id/forumNameView"
-		tools:text="Shared by Megalox"/>
+		tools:text="Shared by Megalox" />
 
 	<TextView
 		android:id="@+id/forumSubscribedView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:text="@string/forum_invitation_exists"
 		android:textColor="?android:attr/textColorTertiary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/sharedByView"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<Button
 		android:id="@+id/acceptButton"
@@ -66,7 +65,7 @@
 		android:layout_height="wrap_content"
 		android:text="@string/accept"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/forumSubscribedView"/>
+		app:layout_constraintTop_toBottomOf="@+id/forumSubscribedView" />
 
 	<Button
 		android:id="@+id/declineButton"
@@ -75,12 +74,12 @@
 		android:layout_height="wrap_content"
 		android:text="@string/decline"
 		app:layout_constraintEnd_toStartOf="@+id/acceptButton"
-		app:layout_constraintTop_toBottomOf="@+id/forumSubscribedView"/>
+		app:layout_constraintTop_toBottomOf="@+id/forumSubscribedView" />
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/acceptButton"/>
+		app:layout_constraintTop_toBottomOf="@+id/acceptButton" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_pending_contact.xml b/briar-android/src/main/res/layout/list_item_pending_contact.xml
index 9de0c5b30..13b98bbae 100644
--- a/briar-android/src/main/res/layout/list_item_pending_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_pending_contact.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout4"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout4"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -11,19 +10,19 @@
 		android:id="@+id/avatar"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
-		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/name"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_large"
 		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginLeft="@dimen/margin_large"
 		android:layout_marginTop="@dimen/margin_large"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
@@ -34,7 +33,7 @@
 		app:layout_constraintStart_toEndOf="@+id/avatar"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed"
-		tools:text="This is a name of a contact"/>
+		tools:text="This is a name of a contact" />
 
 	<androidx.appcompat.widget.AppCompatImageButton
 		android:id="@+id/removeButton"
@@ -46,30 +45,30 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/name"
 		app:layout_constraintTop_toTopOf="parent"
-		app:tint="?attr/colorControlNormal"/>
+		app:tint="?attr/colorControlNormal" />
 
 	<TextView
 		android:id="@+id/status"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
 		android:layout_marginEnd="16dp"
 		android:layout_marginRight="16dp"
-		android:layout_marginTop="8dp"
 		android:text="@string/adding_contact_failed"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintEnd_toStartOf="@+id/time"
 		app:layout_constraintStart_toStartOf="@+id/name"
 		app:layout_constraintTop_toBottomOf="@+id/name"
-		tools:textColor="@color/briar_red"/>
+		tools:textColor="@color/briar_red" />
 
 	<TextView
 		android:id="@+id/time"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="0dp"
 		android:layout_marginEnd="@dimen/margin_large"
 		android:layout_marginRight="@dimen/margin_large"
-		android:layout_marginTop="0dp"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
@@ -77,17 +76,17 @@
 		app:layout_constraintStart_toEndOf="@+id/status"
 		app:layout_constraintTop_toTopOf="@+id/status"
 		app:layout_constraintVertical_bias="0.0"
-		tools:text="Dec 24"/>
+		tools:text="Dec 24" />
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
 		android:layout_width="0dp"
-		android:layout_marginLeft="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:layout_marginTop="@dimen/margin_large"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatar"
-		app:layout_constraintTop_toBottomOf="@+id/status"/>
+		app:layout_constraintTop_toBottomOf="@+id/status" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_revealable_contact.xml b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
index 93bd3242a..059077098 100644
--- a/briar-android/src/main/res/layout/list_item_revealable_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -16,46 +15,46 @@
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:src="@mipmap/ic_launcher_round"/>
+		tools:src="@mipmap/ic_launcher_round" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/nameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_vertical_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toStartOf="@+id/checkBox"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="Revealable Contact with a long name"/>
+		tools:text="Revealable Contact with a long name" />
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/visibilityView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="4dp"
 		android:src="@drawable/ic_visibility"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toBottomOf="@+id/nameView"
 		app:tint="?attr/colorControlNormal"
-		tools:ignore="ContentDescription"/>
+		tools:ignore="ContentDescription" />
 
 	<TextView
 		android:id="@+id/infoView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/listitem_vertical_margin"
-		android:layout_marginEnd="@dimen/margin_small"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/margin_small"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
+		android:layout_marginBottom="@dimen/listitem_vertical_margin"
 		android:text="@string/groups_reveal_visible"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
@@ -63,7 +62,7 @@
 		app:layout_constraintEnd_toStartOf="@+id/checkBox"
 		app:layout_constraintStart_toEndOf="@+id/visibilityView"
 		app:layout_constraintTop_toTopOf="@+id/visibilityView"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<CheckBox
 		android:id="@+id/checkBox"
@@ -73,15 +72,15 @@
 		android:clickable="false"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintStart_toEndOf="@id/avatarView"/>
+		app:layout_constraintStart_toEndOf="@id/avatarView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_rss_feed.xml b/briar-android/src/main/res/layout/list_item_rss_feed.xml
index 4364b076a..81414aa96 100644
--- a/briar-android/src/main/res/layout/list_item_rss_feed.xml
+++ b/briar-android/src/main/res/layout/list_item_rss_feed.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -11,15 +10,15 @@
 		android:id="@+id/titleView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toStartOf="@+id/deleteButton"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="This is a name of a RSS Feed that can be long"/>
+		tools:text="This is a name of a RSS Feed that can be long" />
 
 	<androidx.appcompat.widget.AppCompatImageButton
 		android:id="@+id/deleteButton"
@@ -31,7 +30,7 @@
 		android:src="@drawable/action_delete_black"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:tint="?attr/colorControlNormal"/>
+		app:tint="?attr/colorControlNormal" />
 
 	<TextView
 		android:id="@+id/author"
@@ -42,22 +41,22 @@
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintStart_toStartOf="@+id/titleView"
-		app:layout_constraintTop_toBottomOf="@+id/titleView"/>
+		app:layout_constraintTop_toBottomOf="@+id/titleView" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/authorView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBaseline_toBaselineOf="@+id/author"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/author"
-		tools:text="Bruce Schneier"/>
+		tools:text="Bruce Schneier" />
 
 	<TextView
 		android:id="@+id/imported"
@@ -68,22 +67,22 @@
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintStart_toStartOf="@+id/titleView"
-		app:layout_constraintTop_toBottomOf="@+id/author"/>
+		app:layout_constraintTop_toBottomOf="@+id/author" />
 
 	<TextView
 		android:id="@+id/importedView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBaseline_toBaselineOf="@+id/imported"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imported"
-		tools:text="July 4"/>
+		tools:text="July 4" />
 
 	<TextView
 		android:id="@+id/updated"
@@ -94,44 +93,44 @@
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintStart_toStartOf="@+id/titleView"
-		app:layout_constraintTop_toBottomOf="@+id/imported"/>
+		app:layout_constraintTop_toBottomOf="@+id/imported" />
 
 	<TextView
 		android:id="@+id/updatedView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toBottomOf="@+id/updated"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/updated"
-		tools:text="5 min. ago"/>
+		tools:text="5 min. ago" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/descriptionView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/updated"
-		tools:text="This is a description of the RSS feed. It can be several lines long, but it can also not exist at all if it is not present in the feed itself."/>
+		tools:text="This is a description of the RSS feed. It can be several lines long, but it can also not exist at all if it is not present in the feed itself." />
 
 	<View
 		style="@style/Divider.ThreadItem"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/descriptionView"/>
+		app:layout_constraintTop_toBottomOf="@+id/descriptionView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_selectable_contact.xml b/briar-android/src/main/res/layout/list_item_selectable_contact.xml
index a5c31cc6b..52e280a4f 100644
--- a/briar-android/src/main/res/layout/list_item_selectable_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_selectable_contact.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout2"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout2"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground">
@@ -17,17 +16,17 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:src="@mipmap/ic_launcher_round"/>
+		tools:src="@mipmap/ic_launcher_round" />
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/nameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintBottom_toTopOf="@+id/infoView"
@@ -36,17 +35,17 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed"
 		app:layout_goneMarginBottom="@dimen/listitem_horizontal_margin"
-		tools:text="This is a name of a contact with a long name"/>
+		tools:text="This is a name of a contact with a long name" />
 
 	<TextView
 		android:id="@+id/infoView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
+		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 		android:maxLines="2"
 		android:text="@string/forum_invitation_already_sharing"
 		android:textColor="?android:attr/textColorTertiary"
@@ -55,7 +54,7 @@
 		app:layout_constraintEnd_toEndOf="@+id/checkBox"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
 		app:layout_constraintTop_toBottomOf="@+id/nameView"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 	<CheckBox
 		android:id="@+id/checkBox"
@@ -65,15 +64,15 @@
 		android:clickable="false"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintStart_toEndOf="@id/avatarView"/>
+		app:layout_constraintStart_toEndOf="@id/avatarView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_thread.xml b/briar-android/src/main/res/layout/list_item_thread.xml
index 56350f79e..a248c5474 100644
--- a/briar-android/src/main/res/layout/list_item_thread.xml
+++ b/briar-android/src/main/res/layout/list_item_thread.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -18,34 +17,34 @@
 			style="@style/DiscussionLevelIndicator"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<View
 			android:id="@+id/nested_line_2"
 			style="@style/DiscussionLevelIndicator"
 			app:layout_constraintStart_toEndOf="@id/nested_line_1"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<View
 			android:id="@+id/nested_line_3"
 			style="@style/DiscussionLevelIndicator"
 			app:layout_constraintStart_toEndOf="@id/nested_line_2"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<View
 			android:id="@+id/nested_line_4"
 			style="@style/DiscussionLevelIndicator"
 			app:layout_constraintStart_toEndOf="@id/nested_line_3"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<View
 			android:id="@+id/nested_line_5"
 			style="@style/DiscussionLevelIndicator"
 			app:layout_constraintStart_toEndOf="@id/nested_line_4"
 			app:layout_constraintTop_toTopOf="parent"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 		<TextView
 			android:id="@+id/nested_line_text"
@@ -60,7 +59,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			tools:text="42"
-			tools:visibility="visible"/>
+			tools:visibility="visible" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -75,37 +74,37 @@
 			android:id="@+id/divider"
 			style="@style/Divider.ThreadItem"
 			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<org.briarproject.briar.android.view.AuthorView
 			android:id="@+id/author"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:paddingEnd="@dimen/margin_medium"
-			android:paddingLeft="@dimen/margin_medium"
-			android:paddingRight="@dimen/margin_medium"
 			android:paddingStart="@dimen/margin_medium"
+			android:paddingLeft="@dimen/margin_medium"
 			android:paddingTop="@dimen/margin_medium"
+			android:paddingEnd="@dimen/margin_medium"
+			android:paddingRight="@dimen/margin_medium"
 			app:layout_constraintBottom_toBottomOf="@+id/text"
 			app:layout_constraintEnd_toStartOf="@+id/btn_reply"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/divider"
 			app:layout_constraintVertical_bias="0.0"
-			app:persona="commenter"/>
+			app:persona="commenter" />
 
 		<TextView
 			android:id="@+id/btn_reply"
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:paddingEnd="@dimen/margin_medium"
-			android:paddingLeft="@dimen/margin_medium"
-			android:paddingRight="@dimen/margin_medium"
 			android:paddingStart="@dimen/margin_medium"
+			android:paddingLeft="@dimen/margin_medium"
+			android:paddingEnd="@dimen/margin_medium"
+			android:paddingRight="@dimen/margin_medium"
 			android:text="@string/btn_reply"
 			android:textSize="@dimen/text_size_tiny"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/divider"/>
+			app:layout_constraintTop_toBottomOf="@+id/divider" />
 
 		<com.vanniktech.emoji.EmojiTextView
 			android:id="@+id/text"
@@ -119,7 +118,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/author"
-			tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
+			tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_transport.xml b/briar-android/src/main/res/layout/list_item_transport.xml
index 80022b327..6af9e1688 100644
--- a/briar-android/src/main/res/layout/list_item_transport.xml
+++ b/briar-android/src/main/res/layout/list_item_transport.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -15,7 +14,7 @@
 		android:layout_height="wrap_content"
 		android:padding="@dimen/margin_small"
 		tools:ignore="ContentDescription"
-		tools:src="@drawable/transport_tor"/>
+		tools:src="@drawable/transport_tor" />
 
 	<TextView
 		android:id="@+id/textView"
@@ -23,6 +22,6 @@
 		android:layout_height="match_parent"
 		android:padding="@dimen/margin_small"
 		android:textColor="?android:attr/textColorSecondary"
-		tools:text="@string/transport_tor"/>
+		tools:text="@string/transport_tor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/navigation_header.xml b/briar-android/src/main/res/layout/navigation_header.xml
index fe37468d6..92a452e94 100644
--- a/briar-android/src/main/res/layout/navigation_header.xml
+++ b/briar-android/src/main/res/layout/navigation_header.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="85dp"
@@ -11,12 +10,12 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|start"
-		android:layout_marginBottom="@dimen/margin_medium"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
+		android:layout_marginBottom="@dimen/margin_medium"
 		android:contentDescription="@string/app_name"
-		android:src="@drawable/navigation_drawer_header"/>
+		android:src="@drawable/navigation_drawer_header" />
 
 </FrameLayout>
diff --git a/briar-android/src/main/res/layout/navigation_menu.xml b/briar-android/src/main/res/layout/navigation_menu.xml
index a78278152..4a7a32c4f 100644
--- a/briar-android/src/main/res/layout/navigation_menu.xml
+++ b/briar-android/src/main/res/layout/navigation_menu.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="wrap_content"
@@ -25,7 +24,7 @@
 			app:itemTextColor="?android:textColorPrimary"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			app:menu="@menu/navigation_drawer"/>
+			app:menu="@menu/navigation_drawer" />
 
 		<View
 			android:id="@+id/divider1"
@@ -33,7 +32,7 @@
 			android:layout_width="0dp"
 			app:layout_constraintEnd_toEndOf="@+id/navigation"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/navigation"/>
+			app:layout_constraintTop_toBottomOf="@+id/navigation" />
 
 		<View
 			android:id="@+id/spacer"
@@ -42,7 +41,7 @@
 			app:layout_constraintBottom_toTopOf="@+id/transports"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/divider1"
-			app:layout_constraintVertical_weight="1"/>
+			app:layout_constraintVertical_weight="1" />
 
 		<include
 			android:id="@+id/transports"
@@ -53,7 +52,7 @@
 			app:layout_constraintEnd_toEndOf="@+id/navigation"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/spacer"
-			tools:layout_height="75dp"/>
+			tools:layout_height="75dp" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/power_view.xml b/briar-android/src/main/res/layout/power_view.xml
index 2653e0593..cf558ce54 100644
--- a/briar-android/src/main/res/layout/power_view.xml
+++ b/briar-android/src/main/res/layout/power_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -11,16 +10,16 @@
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_large"
-		android:layout_marginLeft="@dimen/margin_large"
-		android:layout_marginRight="@dimen/margin_large"
 		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginLeft="@dimen/margin_large"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginRight="@dimen/margin_large"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		tools:text="@string/setup_huawei_text"/>
+		tools:text="@string/setup_huawei_text" />
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/checkImage"
@@ -33,7 +32,7 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="@+id/button"
 		app:tint="?attr/colorControlNormal"
-		tools:ignore="ContentDescription"/>
+		tools:ignore="ContentDescription" />
 
 	<Button
 		android:id="@+id/button"
@@ -44,7 +43,7 @@
 		app:layout_constraintEnd_toStartOf="@+id/helpButton"
 		app:layout_constraintStart_toEndOf="@+id/checkImage"
 		app:layout_constraintTop_toBottomOf="@+id/textView"
-		tools:text="@string/setup_huawei_button"/>
+		tools:text="@string/setup_huawei_button" />
 
 	<ImageButton
 		android:id="@+id/helpButton"
@@ -57,6 +56,6 @@
 		android:tint="@color/briar_button_text_positive"
 		app:layout_constraintBottom_toBottomOf="@+id/button"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toTopOf="@+id/button"/>
+		app:layout_constraintTop_toTopOf="@+id/button" />
 
 </merge>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/preference_switch_compat.xml b/briar-android/src/main/res/layout/preference_switch_compat.xml
index 9cafa42a5..7ebf4bbbe 100644
--- a/briar-android/src/main/res/layout/preference_switch_compat.xml
+++ b/briar-android/src/main/res/layout/preference_switch_compat.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Needed for SwitchPreference on Android 4 (API < 21)-->
-<androidx.appcompat.widget.SwitchCompat
-	android:id="@android:id/switch_widget"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!-- Needed for SwitchPreference on Android 4 (API < 21)-->
+<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@android:id/switch_widget"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
 	android:background="@null"
 	android:clickable="false"
 	android:focusable="false"
 	android:focusableInTouchMode="false"
-	tools:targetApi="n"/>
+	tools:targetApi="n" />
diff --git a/briar-android/src/main/res/layout/preferences_category.xml b/briar-android/src/main/res/layout/preferences_category.xml
index 853d70872..fe5605daa 100644
--- a/briar-android/src/main/res/layout/preferences_category.xml
+++ b/briar-android/src/main/res/layout/preferences_category.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-	android:id="@android:id/title"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@android:id/title"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="@color/preference_category_background"
@@ -10,4 +9,4 @@
 	android:textColor="@color/briar_accent"
 	android:textSize="14sp"
 	android:textStyle="bold"
-	tools:text="@string/security_settings_title"/>
\ No newline at end of file
+	tools:text="@string/security_settings_title" />
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/qr_code_view.xml b/briar-android/src/main/res/layout/qr_code_view.xml
index 95d2d8189..351ad5765 100644
--- a/briar-android/src/main/res/layout/qr_code_view.xml
+++ b/briar-android/src/main/res/layout/qr_code_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	tools:showIn="@layout/fragment_keyagreement_qr">
 
@@ -8,14 +7,14 @@
 		style="?android:attr/progressBarStyleLarge"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_gravity="center"/>
+		android:layout_gravity="center" />
 
 	<ImageView
 		android:id="@+id/qr_code"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:contentDescription="@string/qr_code"
-		android:scaleType="fitCenter"/>
+		android:scaleType="fitCenter" />
 
 	<ImageView
 		android:id="@+id/fullscreen_button"
@@ -26,6 +25,6 @@
 		android:alpha="0.54"
 		android:background="?attr/selectableItemBackground"
 		android:contentDescription="@string/show_qr_code_fullscreen"
-		android:src="@drawable/ic_fullscreen_black_48dp"/>
+		android:src="@drawable/ic_fullscreen_black_48dp" />
 
 </merge>
diff --git a/briar-android/src/main/res/layout/splash.xml b/briar-android/src/main/res/layout/splash.xml
index 9466f9a0e..410dbb74d 100644
--- a/briar-android/src/main/res/layout/splash.xml
+++ b/briar-android/src/main/res/layout/splash.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -10,6 +9,6 @@
 		android:layout_gravity="center"
 		android:layout_margin="@dimen/margin_xxlarge"
 		android:contentDescription="@string/app_name"
-		android:src="@drawable/splash_screen"/>
+		android:src="@drawable/splash_screen" />
 
 </FrameLayout>
diff --git a/briar-android/src/main/res/layout/text_avatar_view.xml b/briar-android/src/main/res/layout/text_avatar_view.xml
index 5d9a74f60..39950a35e 100644
--- a/briar-android/src/main/res/layout/text_avatar_view.xml
+++ b/briar-android/src/main/res/layout/text_avatar_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	tools:showIn="@layout/list_item_forum">
 
@@ -10,16 +9,16 @@
 		android:layout_width="@dimen/avatar_forum_size"
 		android:layout_height="@dimen/avatar_forum_size"
 		android:layout_gravity="bottom|left|start"
-		tools:src="@color/briar_button_text_positive"/>
+		tools:src="@color/briar_button_text_positive" />
 
 	<androidx.appcompat.widget.AppCompatTextView
 		android:id="@+id/textAvatarView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
+		android:layout_marginTop="@dimen/listitem_picture_frame_offset_vertical"
 		android:layout_marginEnd="@dimen/listitem_picture_frame_offset_horizontal"
 		android:layout_marginRight="@dimen/listitem_picture_frame_offset_horizontal"
-		android:layout_marginTop="@dimen/listitem_picture_frame_offset_vertical"
 		android:maxLength="1"
 		android:shadowColor="@color/forum_avatar_shadow"
 		android:shadowDx="0"
@@ -27,7 +26,7 @@
 		android:shadowRadius="1.5"
 		android:textColor="@color/briar_text_primary_inverse"
 		android:textSize="@dimen/avatar_text_size"
-		tools:text="T"/>
+		tools:text="T" />
 
 	<TextView
 		android:id="@+id/unreadCountView"
@@ -42,6 +41,6 @@
 		android:textStyle="bold"
 		android:visibility="invisible"
 		tools:text="12"
-		tools:visibility="visible"/>
+		tools:visibility="visible" />
 
 </merge>
diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml
index 26028b376..353652ed9 100644
--- a/briar-android/src/main/res/layout/text_input_view.xml
+++ b/briar-android/src/main/res/layout/text_input_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,7 +9,7 @@
 
 	<View
 		style="@style/Divider.Horizontal"
-		android:layout_alignParentTop="true"/>
+		android:layout_alignParentTop="true" />
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -22,13 +21,13 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			app:maxTextLines="4"/>
+			app:maxTextLines="4" />
 
 		<org.briarproject.briar.android.view.CompositeSendButton
 			android:id="@+id/compositeSendButton"
 			android:layout_width="@dimen/text_input_height"
 			android:layout_height="@dimen/text_input_height"
-			android:layout_gravity="bottom"/>
+			android:layout_gravity="bottom" />
 
 	</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/text_input_view_large.xml b/briar-android/src/main/res/layout/text_input_view_large.xml
index 32fd2e8f0..076b6a6c1 100644
--- a/briar-android/src/main/res/layout/text_input_view_large.xml
+++ b/briar-android/src/main/res/layout/text_input_view_large.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -11,11 +10,11 @@
 		android:id="@+id/input_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:elevation="@dimen/cardview_default_elevation"
 		android:minHeight="@dimen/text_input_height"
 		app:cardBackgroundColor="@color/card_background"
@@ -27,17 +26,17 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			app:textPaddingBottom="10dp"
-			app:textPaddingEnd="@dimen/margin_medium"/>
+			app:textPaddingEnd="@dimen/margin_medium" />
 
 	</androidx.cardview.widget.CardView>
 
 	<Button
 		android:id="@+id/compositeSendButton"
 		style="@style/BriarButton"
-		android:layout_marginEnd="@dimen/margin_small"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/margin_small"
 		android:layout_marginStart="@dimen/margin_small"
-		tools:text="@string/send"/>
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
+		tools:text="@string/send" />
 
 </merge>
diff --git a/briar-android/src/main/res/layout/toolbar.xml b/briar-android/src/main/res/layout/toolbar.xml
index 8f13c295d..72ee676f5 100644
--- a/briar-android/src/main/res/layout/toolbar.xml
+++ b/briar-android/src/main/res/layout/toolbar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.AppBarLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -10,6 +9,6 @@
 		android:id="@+id/toolbar"
 		style="@style/BriarToolbar"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"/>
+		android:layout_height="wrap_content" />
 
 </com.google.android.material.appbar.AppBarLayout>
diff --git a/briar-android/src/main/res/layout/transports_list.xml b/briar-android/src/main/res/layout/transports_list.xml
index 17fd52a59..a484522c7 100644
--- a/briar-android/src/main/res/layout/transports_list.xml
+++ b/briar-android/src/main/res/layout/transports_list.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
 	tools:showIn="@layout/navigation_menu">
 
-	<View style="@style/Divider.Horizontal"/>
+	<View style="@style/Divider.Horizontal" />
 
 	<GridView
 		android:id="@+id/transportsView"
@@ -15,6 +14,6 @@
 		android:layout_height="wrap_content"
 		android:listSelector="@android:color/transparent"
 		android:numColumns="3"
-		tools:listitem="@layout/list_item_transport"/>
+		tools:listitem="@layout/list_item_transport" />
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/unread_message_button.xml b/briar-android/src/main/res/layout/unread_message_button.xml
index 03673deca..196ee497d 100644
--- a/briar-android/src/main/res/layout/unread_message_button.xml
+++ b/briar-android/src/main/res/layout/unread_message_button.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	tools:showIn="@layout/activity_threaded_conversation">
@@ -10,16 +9,16 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		app:fabSize="mini"
-		app:useCompatPadding="true"/>
+		app:useCompatPadding="true" />
 
 	<TextView
 		android:id="@+id/unreadCountView"
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/unread_bubble_size"
 		android:layout_gravity="right|end|top"
+		android:layout_marginTop="10dp"
 		android:layout_marginEnd="5dp"
 		android:layout_marginRight="5dp"
-		android:layout_marginTop="10dp"
 		android:background="@drawable/bubble"
 		android:elevation="7dp"
 		android:gravity="center"
@@ -27,6 +26,6 @@
 		android:textColor="@color/briar_text_primary_inverse"
 		android:textSize="@dimen/unread_bubble_text_size"
 		android:textStyle="bold"
-		tools:text="12"/>
+		tools:text="12" />
 
 </merge>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/view_composite_send_button.xml b/briar-android/src/main/res/layout/view_composite_send_button.xml
index 7e79d2d82..8ecfb1b81 100644
--- a/briar-android/src/main/res/layout/view_composite_send_button.xml
+++ b/briar-android/src/main/res/layout/view_composite_send_button.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="@dimen/text_input_height"
@@ -22,7 +21,7 @@
 		android:scaleType="center"
 		android:src="@drawable/ic_image_off"
 		android:visibility="invisible"
-		app:tint="?attr/colorControlNormal"/>
+		app:tint="?attr/colorControlNormal" />
 
 	<androidx.appcompat.widget.AppCompatImageButton
 		android:id="@+id/sendButton"
@@ -36,12 +35,12 @@
 		android:padding="4dp"
 		android:scaleType="center"
 		android:src="@drawable/social_send_now_white"
-		app:tint="@color/briar_accent"/>
+		app:tint="@color/briar_accent" />
 
 	<ProgressBar
 		android:id="@+id/progressBar"
 		android:layout_width="@dimen/text_input_height"
 		android:layout_height="@dimen/text_input_height"
-		android:visibility="invisible"/>
+		android:visibility="invisible" />
 
 </merge>
\ No newline at end of file