diff --git a/app/src/main/res/layout/account_row.xml b/app/src/main/res/layout/account_row.xml
index b746d1fb..2a3a70c3 100644
--- a/app/src/main/res/layout/account_row.xml
+++ b/app/src/main/res/layout/account_row.xml
@@ -27,7 +27,8 @@
         android:layout_marginStart="6dp"
         android:icon="@android:drawable/ic_menu_delete"
         android:background="@null"
-        android:scaleType="centerCrop" >
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/delete">
     </ImageButton>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/alert_title.xml b/app/src/main/res/layout/alert_title.xml
index 4136548d..55f47ae1 100644
--- a/app/src/main/res/layout/alert_title.xml
+++ b/app/src/main/res/layout/alert_title.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="?dialogPreferredPadding"
-        android:textSize="20sp"
-        android:background="@color/colorPrimary"
-        android:textColor="@color/colorWhite" >
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="?dialogPreferredPadding"
+    android:textSize="20sp"
+    android:background="@color/colorPrimary"
+    android:textColor="@color/colorWhite" >
 </TextView>
 
diff --git a/app/src/main/res/layout/contact_row.xml b/app/src/main/res/layout/contact_row.xml
index ec3436cc..3b509857 100644
--- a/app/src/main/res/layout/contact_row.xml
+++ b/app/src/main/res/layout/contact_row.xml
@@ -31,7 +31,8 @@
             android:layout_height="36dp"
             android:layout_width="36dp"
             android:adjustViewBounds="true"
-            android:scaleType="centerCrop" >
+            android:scaleType="centerCrop"
+            android:contentDescription="@string/avatar_image">
         </ImageView>
 
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/message.xml b/app/src/main/res/layout/message.xml
index 6e0797f0..6a21fe87 100644
--- a/app/src/main/res/layout/message.xml
+++ b/app/src/main/res/layout/message.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
@@ -8,7 +9,8 @@
         android:id="@+id/message"
         android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        tools:ignore="UselessParent" >
 
         <TextView
             android:id="@+id/info"