1 files changed, 13 insertions, 15 deletions

diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index 6fe5ec40a..3d64ea468 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -1,51 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/presence_template"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?android:attr/activatedBackgroundIndicator"
-    android:paddingTop="8dp"
-    android:paddingLeft="8dp"
-    android:paddingBottom="8dp"
-    android:id="@+id/presence_template">
+    android:padding="12dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerVertical="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="8dp"
         android:layout_toLeftOf="@+id/delete_button"
         android:layout_toStartOf="@+id/delete_button"
-        android:layout_marginRight="8dp">
+        android:minHeight="48dp"
+        android:orientation="vertical">
 
         <android.support.text.emoji.widget.EmojiTextView
+            android:id="@+id/presence_status_message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/presence_status_message"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
         <android.support.text.emoji.widget.EmojiTextView
             android:id="@+id/status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
             android:paddingBottom="1dp"
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
             android:paddingTop="1dp"
             android:textAllCaps="true"
-            android:textColor="@color/white"
-            android:textSize="?attr/TextSizeInfo"
-            android:layout_marginTop="4dp" />
+            android:textAppearance="@style/TextAppearance.Conversations.Tag" />
     </LinearLayout>
 
     <ImageButton
+        android:id="@+id/delete_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/delete_button"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/image_button_padding"
         android:src="?attr/icon_remove" />