diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 0e7e381e..49a5bd38 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -33,7 +33,6 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "0.0.1"
-        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
diff --git a/vector/build.gradle b/vector/build.gradle
index c3c1d189..5e17277f 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -58,7 +58,9 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "im.vector.riotredesign"
-        minSdkVersion 16
+        // Set to API 19 because motionLayout is min API 18.
+        // In the future we may consider using an alternative of MotionLayout to support API 16. But for security reason, maybe not.
+        minSdkVersion 19
         targetSdkVersion 28
         multiDexEnabled true
         versionCode generateVersionCodeFromTimestamp()
diff --git a/vector/lint.xml b/vector/lint.xml
index 3e4078d7..b6da88ae 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -22,7 +22,8 @@
 
     <!-- RTL -->
     <issue id="RtlEnabled" severity="error" />
-    <issue id="RtlHardcoded" severity="error" />
+    <!-- Now with min API set to 19, we do not need Left and Right attribute, Start and End is enougth. For the moment, just reduce the severity -->
+    <issue id="RtlHardcoded" severity="warning" />
     <issue id="RtlSymmetry" severity="error" />
 
     <!-- Code -->
diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt
index 741ad995..1e50f90b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt
@@ -16,10 +16,10 @@
 
 package im.vector.riotredesign.features.media
 
-import android.media.ExifInterface
 import android.net.Uri
 import android.os.Parcelable
 import android.widget.ImageView
+import androidx.exifinterface.media.ExifInterface
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.github.piasy.biv.view.BigImageView
 import im.vector.matrix.android.api.Matrix
diff --git a/vector/src/main/res/anim/unread_marker_anim.xml b/vector/src/main/res/anim/unread_marker_anim.xml
index 6cc9d9ec..0c7ddab3 100644
--- a/vector/src/main/res/anim/unread_marker_anim.xml
+++ b/vector/src/main/res/anim/unread_marker_anim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale xmlns:android="http://schemas.android.com/apk/res/android"
+    <scale
         android:duration="1500"
         android:fromXScale="1"
         android:fromYScale="1"
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index aeaa2fb9..feaa79e1 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -90,7 +90,7 @@
             android:layout_marginRight="16dp"
             android:scaleType="fitCenter"
             android:src="@drawable/backup_keys"
-            android:tint="?android:attr/textColorTertiary" />
+            android:tint="?riotx_text_primary" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -125,7 +125,7 @@
             android:layout_marginRight="16dp"
             android:scaleType="fitCenter"
             android:src="@drawable/backup_keys"
-            android:tint="?android:attr/textColorTertiary" />
+            android:tint="?riotx_text_primary" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
index a6091b92..43552428 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
@@ -75,7 +75,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="38dp"
         android:alpha="0"
-        android:tint="?android:attr/textColorTertiary"
+        android:tint="?riotx_text_primary"
         app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
         tools:ignore="MissingConstraints"
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index f71ccf5e..dcf13b4d 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -80,7 +80,7 @@
         android:layout_marginTop="6dp"
         android:layout_marginBottom="38dp"
         android:alpha="1"
-        android:tint="?android:attr/textColorTertiary"
+        android:tint="?riotx_text_primary"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="@id/composer_related_message_avatar_view"
         app:layout_constraintStart_toStartOf="@id/composer_related_message_avatar_view"
diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml
index 3828063f..c5db963c 100644
--- a/vector/src/main/res/layout/merge_composer_layout.xml
+++ b/vector/src/main/res/layout/merge_composer_layout.xml
@@ -63,7 +63,7 @@
         android:id="@+id/composer_related_message_action_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:tint="?android:attr/textColorTertiary"
+        android:tint="?riotx_text_primary"
         tools:ignore="MissingConstraints" />
 
     <ImageButton