diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 78c8eaabd8..e3b9ba732a 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -58,6 +58,10 @@ android {
     adbOptions {
         installOptions "-g"
     }
+
+    lintOptions {
+        lintConfig file("lint.xml")
+    }
 }
 
 static def gitRevision() {
diff --git a/matrix-sdk-android/lint.xml b/matrix-sdk-android/lint.xml
new file mode 100644
index 0000000000..3e4078d7d9
--- /dev/null
+++ b/matrix-sdk-android/lint.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- Modify some severity -->
+
+    <!-- Resource -->
+    <issue id="MissingTranslation" severity="warning" />
+    <issue id="TypographyEllipsis" severity="error" />
+    <issue id="ImpliedQuantity" severity="warning" />
+
+    <!-- UX -->
+    <issue id="ButtonOrder" severity="error" />
+
+    <!-- Layout -->
+    <issue id="UnknownIdInLayout" severity="error" />
+    <issue id="StringFormatCount" severity="error" />
+    <issue id="HardcodedText" severity="error" />
+    <issue id="SpUsage" severity="error" />
+    <issue id="ObsoleteLayoutParam" severity="error" />
+    <issue id="InefficientWeight" severity="error" />
+    <issue id="DisableBaselineAlignment" severity="error" />
+    <issue id="ScrollViewSize" severity="error" />
+
+    <!-- RTL -->
+    <issue id="RtlEnabled" severity="error" />
+    <issue id="RtlHardcoded" severity="error" />
+    <issue id="RtlSymmetry" severity="error" />
+
+    <!-- Code -->
+    <issue id="SetTextI18n" severity="error" />
+    <issue id="ViewConstructor" severity="error" />
+    <issue id="UseValueOf" severity="error" />
+
+</lint>
diff --git a/matrix-sdk-android/src/main/res/layout/adapter_item_icon_and_text.xml b/matrix-sdk-android/src/main/res/layout/adapter_item_icon_and_text.xml
index 4227dd9be6..03de7154d8 100644
--- a/matrix-sdk-android/src/main/res/layout/adapter_item_icon_and_text.xml
+++ b/matrix-sdk-android/src/main/res/layout/adapter_item_icon_and_text.xml
@@ -1,20 +1,21 @@
 <?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:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="horizontal"
     android:paddingTop="10dp"
-    android:paddingBottom="10dp"
-    android:orientation="horizontal" >
+    android:paddingBottom="10dp">
 
     <ImageView
         android:id="@+id/imageView_icon_and_text"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_gravity="center_vertical"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/matrix_user"/>
+        android:src="@drawable/matrix_user" />
 
     <TextView
         android:id="@+id/textView_icon_and_text"
@@ -24,7 +25,7 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:singleLine="true"
-        android:text = "A text here"
-        android:textColor="@android:color/white"/>
+        android:textColor="@android:color/white"
+        tools:text="A text here" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/build.gradle b/vector/build.gradle
index 3957a8a0ff..be66c06da4 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -107,35 +107,7 @@ android {
     }
 
     lintOptions {
-        warning 'MissingTranslation'
-
-        // Treat some warnings as errors
-        // Resources
-        error 'TypographyEllipsis'
-        warning 'ImpliedQuantity'
-
-        // UX
-        error 'ButtonOrder'
-
-        // Layout
-        error 'UnknownIdInLayout'
-        error 'StringFormatCount'
-        error 'HardcodedText'
-        error 'SpUsage'
-        error 'ObsoleteLayoutParam'
-        error 'InefficientWeight'
-        error 'DisableBaselineAlignment'
-        error 'ScrollViewSize'
-
-        // RTL
-        error 'RtlEnabled'
-        error 'RtlHardcoded'
-        error 'RtlSymmetry'
-
-        // Code
-        error 'SetTextI18n'
-        error 'ViewConstructor'
-        error 'UseValueOf'
+        lintConfig file("lint.xml")
     }
 
     compileOptions {
diff --git a/vector/lint.xml b/vector/lint.xml
new file mode 100644
index 0000000000..3e4078d7d9
--- /dev/null
+++ b/vector/lint.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- Modify some severity -->
+
+    <!-- Resource -->
+    <issue id="MissingTranslation" severity="warning" />
+    <issue id="TypographyEllipsis" severity="error" />
+    <issue id="ImpliedQuantity" severity="warning" />
+
+    <!-- UX -->
+    <issue id="ButtonOrder" severity="error" />
+
+    <!-- Layout -->
+    <issue id="UnknownIdInLayout" severity="error" />
+    <issue id="StringFormatCount" severity="error" />
+    <issue id="HardcodedText" severity="error" />
+    <issue id="SpUsage" severity="error" />
+    <issue id="ObsoleteLayoutParam" severity="error" />
+    <issue id="InefficientWeight" severity="error" />
+    <issue id="DisableBaselineAlignment" severity="error" />
+    <issue id="ScrollViewSize" severity="error" />
+
+    <!-- RTL -->
+    <issue id="RtlEnabled" severity="error" />
+    <issue id="RtlHardcoded" severity="error" />
+    <issue id="RtlSymmetry" severity="error" />
+
+    <!-- Code -->
+    <issue id="SetTextI18n" severity="error" />
+    <issue id="ViewConstructor" severity="error" />
+    <issue id="UseValueOf" severity="error" />
+
+</lint>