diff --git a/app/build.gradle b/app/build.gradle
index 196d86999..53720df65 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -152,12 +152,9 @@ dependencies {
     if (firebaseEnabled()) {
         implementation 'com.google.firebase:firebase-messaging:17.5.0'
     }
-    implementation 'com.android.billingclient:billing:1.2'
     implementation 'org.apache.commons:commons-compress:1.18'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.google.android.material:material:1.1.0-alpha04'
     implementation 'com.google.android:flexbox:1.1.0'
     implementation 'com.github.bumptech.glide:glide:4.9.0'
 
diff --git a/app/src/main/res/layout-land/about.xml b/app/src/main/res/layout-land/about.xml
index 9f5fa2cab..27cc81442 100644
--- a/app/src/main/res/layout-land/about.xml
+++ b/app/src/main/res/layout-land/about.xml
@@ -5,7 +5,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <LinearLayout
diff --git a/app/src/main/res/layout-land/assistant_email_account_creation.xml b/app/src/main/res/layout-land/assistant_email_account_creation.xml
index 22a47812c..c9b6cc1da 100644
--- a/app/src/main/res/layout-land/assistant_email_account_creation.xml
+++ b/app/src/main/res/layout-land/assistant_email_account_creation.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout-land/assistant_generic_connection.xml b/app/src/main/res/layout-land/assistant_generic_connection.xml
index 93f7d8217..8c306e5ca 100644
--- a/app/src/main/res/layout-land/assistant_generic_connection.xml
+++ b/app/src/main/res/layout-land/assistant_generic_connection.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout-land/assistant_menu.xml b/app/src/main/res/layout-land/assistant_menu.xml
index 2df90dbd0..b459251a2 100644
--- a/app/src/main/res/layout-land/assistant_menu.xml
+++ b/app/src/main/res/layout-land/assistant_menu.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index 30e5fe32e..c66924c6f 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -72,7 +72,6 @@
                     </LinearLayout>
 
                     <RelativeLayout
-                        android:id="@+id/avatar_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_below="@id/active_call_info"
diff --git a/app/src/main/res/layout-land/history_detail.xml b/app/src/main/res/layout-land/history_detail.xml
index a828e9a4a..f204c8e2b 100644
--- a/app/src/main/res/layout-land/history_detail.xml
+++ b/app/src/main/res/layout-land/history_detail.xml
@@ -65,7 +65,6 @@
             android:padding="5dp">
 
             <RelativeLayout
-                android:id="@+id/avatar_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center">
@@ -127,7 +126,6 @@
                         android:src="@drawable/chat_start_default" />
 
                     <ImageView
-                        android:id="@+id/security_level"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout-sw533dp/history_detail.xml b/app/src/main/res/layout-sw533dp/history_detail.xml
index d390b8fc7..fbc75bb01 100644
--- a/app/src/main/res/layout-sw533dp/history_detail.xml
+++ b/app/src/main/res/layout-sw533dp/history_detail.xml
@@ -62,7 +62,6 @@
             android:paddingBottom="5dp">
 
             <RelativeLayout
-                android:id="@+id/avatar_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center">
@@ -124,7 +123,6 @@
                         android:src="@drawable/chat_start_default" />
 
                     <ImageView
-                        android:id="@+id/security_level"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 535caeae2..fde8f876a 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -5,7 +5,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/assistant_account_connection.xml b/app/src/main/res/layout/assistant_account_connection.xml
index 9d8e09b1e..6dfd94813 100644
--- a/app/src/main/res/layout/assistant_account_connection.xml
+++ b/app/src/main/res/layout/assistant_account_connection.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:paddingRight="30dp"
             android:paddingLeft="30dp"
             android:orientation="vertical">
diff --git a/app/src/main/res/layout/assistant_email_account_creation.xml b/app/src/main/res/layout/assistant_email_account_creation.xml
index 7fbcb4571..603f06d12 100644
--- a/app/src/main/res/layout/assistant_email_account_creation.xml
+++ b/app/src/main/res/layout/assistant_email_account_creation.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/assistant_generic_connection.xml b/app/src/main/res/layout/assistant_generic_connection.xml
index 785045ba5..57fd8ec7c 100644
--- a/app/src/main/res/layout/assistant_generic_connection.xml
+++ b/app/src/main/res/layout/assistant_generic_connection.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/assistant_menu.xml b/app/src/main/res/layout/assistant_menu.xml
index 9a08f7575..39ee0a658 100644
--- a/app/src/main/res/layout/assistant_menu.xml
+++ b/app/src/main/res/layout/assistant_menu.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/assistant_phone_account_creation.xml b/app/src/main/res/layout/assistant_phone_account_creation.xml
index 29b61ea1c..891e0d002 100644
--- a/app/src/main/res/layout/assistant_phone_account_creation.xml
+++ b/app/src/main/res/layout/assistant_phone_account_creation.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/assistant_phone_account_linking.xml b/app/src/main/res/layout/assistant_phone_account_linking.xml
index 0d6978d63..61587be96 100644
--- a/app/src/main/res/layout/assistant_phone_account_linking.xml
+++ b/app/src/main/res/layout/assistant_phone_account_linking.xml
@@ -22,7 +22,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index 17654c8d5..d14cdd533 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -72,7 +72,6 @@
                     </LinearLayout>
 
                     <RelativeLayout
-                        android:id="@+id/avatar_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_below="@id/active_call_info"
diff --git a/app/src/main/res/layout/call_inactive_row.xml b/app/src/main/res/layout/call_inactive_row.xml
index b27a6c699..5ac4c11bf 100644
--- a/app/src/main/res/layout/call_inactive_row.xml
+++ b/app/src/main/res/layout/call_inactive_row.xml
@@ -8,7 +8,6 @@
     android:padding="5dp">
 
     <RelativeLayout
-        android:id="@+id/avatar_layout"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:gravity="center">
diff --git a/app/src/main/res/layout/call_incoming.xml b/app/src/main/res/layout/call_incoming.xml
index 4e096ef58..5b34690ff 100644
--- a/app/src/main/res/layout/call_incoming.xml
+++ b/app/src/main/res/layout/call_incoming.xml
@@ -59,7 +59,6 @@
             android:paddingBottom="10dp" />
 
         <RelativeLayout
-            android:id="@+id/avatar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/contact_number"
diff --git a/app/src/main/res/layout/call_outgoing.xml b/app/src/main/res/layout/call_outgoing.xml
index 636d73bac..38c5b4db0 100644
--- a/app/src/main/res/layout/call_outgoing.xml
+++ b/app/src/main/res/layout/call_outgoing.xml
@@ -60,7 +60,6 @@
             android:paddingBottom="10dp" />
 
         <RelativeLayout
-            android:id="@+id/avatar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/contact_number"
diff --git a/app/src/main/res/layout/contact.xml b/app/src/main/res/layout/contact.xml
index 7889a9348..dfc09206d 100644
--- a/app/src/main/res/layout/contact.xml
+++ b/app/src/main/res/layout/contact.xml
@@ -63,7 +63,6 @@
                 android:paddingTop="20dp">
 
                 <RelativeLayout
-                    android:id="@+id/avatar_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center">
diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml
index b2e688cad..fe9bf625b 100644
--- a/app/src/main/res/layout/contact_edit.xml
+++ b/app/src/main/res/layout/contact_edit.xml
@@ -67,7 +67,6 @@
                 android:paddingRight="10dp">
 
                 <RelativeLayout
-                    android:id="@+id/avatar_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center">
diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml
index 2a622b071..d1b521a34 100644
--- a/app/src/main/res/layout/history_detail.xml
+++ b/app/src/main/res/layout/history_detail.xml
@@ -62,7 +62,6 @@
             android:paddingBottom="5dp">
 
             <RelativeLayout
-                android:id="@+id/avatar_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center">
@@ -124,7 +123,6 @@
                         android:src="@drawable/chat_start_default" />
 
                     <ImageView
-                        android:id="@+id/security_level"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index cb1e67295..c8db90bc7 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_account.xml b/app/src/main/res/layout/settings_account.xml
index 86f4fa944..5c5083888 100644
--- a/app/src/main/res/layout/settings_account.xml
+++ b/app/src/main/res/layout/settings_account.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_advanced.xml b/app/src/main/res/layout/settings_advanced.xml
index 96fa5a107..54c33fc27 100644
--- a/app/src/main/res/layout/settings_advanced.xml
+++ b/app/src/main/res/layout/settings_advanced.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_audio.xml b/app/src/main/res/layout/settings_audio.xml
index a4c1aa7cb..e0e3452bc 100644
--- a/app/src/main/res/layout/settings_audio.xml
+++ b/app/src/main/res/layout/settings_audio.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_call.xml b/app/src/main/res/layout/settings_call.xml
index 6ffff1f20..5bc59ff3e 100644
--- a/app/src/main/res/layout/settings_call.xml
+++ b/app/src/main/res/layout/settings_call.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_chat.xml b/app/src/main/res/layout/settings_chat.xml
index d218213a4..20a22a6c1 100644
--- a/app/src/main/res/layout/settings_chat.xml
+++ b/app/src/main/res/layout/settings_chat.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_network.xml b/app/src/main/res/layout/settings_network.xml
index 6e0a9b7dc..5da4ab976 100644
--- a/app/src/main/res/layout/settings_network.xml
+++ b/app/src/main/res/layout/settings_network.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_tunnel.xml b/app/src/main/res/layout/settings_tunnel.xml
index 0b6331fad..434081d83 100644
--- a/app/src/main/res/layout/settings_tunnel.xml
+++ b/app/src/main/res/layout/settings_tunnel.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/settings_video.xml b/app/src/main/res/layout/settings_video.xml
index 4d318731d..7a1c55af9 100644
--- a/app/src/main/res/layout/settings_video.xml
+++ b/app/src/main/res/layout/settings_video.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:orientation="vertical">