diff --git a/app/build.gradle b/app/build.gradle
index eccdc7909..779003c7d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,7 +177,7 @@ configurations.all {
 
 dependencies {
     implementation fileTree(include: ['*'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.github.vanniktech:Emoji:0.6.0'  // 0.7.0 has display issue - don't update to 0.7.0
diff --git a/app/src/main/res/layout/controller_entry_menu.xml b/app/src/main/res/layout/controller_entry_menu.xml
index c1a75898e..7c7de3714 100644
--- a/app/src/main/res/layout/controller_entry_menu.xml
+++ b/app/src/main/res/layout/controller_entry_menu.xml
@@ -75,8 +75,8 @@
         android:background="@color/transparent"
         android:contentDescription="@string/nc_add_emojis"
         android:src="@drawable/ic_insert_emoticon_black_24dp"
-        android:tint="@color/emoji_icons"
         android:visibility="gone"
+        app:tint="@color/emoji_icons"
         tools:visibility="visible" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_profile.xml b/app/src/main/res/layout/controller_profile.xml
index 5eaf66036..093bed086 100644
--- a/app/src/main/res/layout/controller_profile.xml
+++ b/app/src/main/res/layout/controller_profile.xml
@@ -79,10 +79,10 @@
                 android:layout_height="30dp"
                 android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_marginRight="@dimen/standard_half_margin"
-                android:tint="@color/black"
-                android:src="@drawable/upload"
                 android:background="@drawable/round_corner"
-                android:contentDescription="@string/upload_new_avatar_from_device" />
+                android:contentDescription="@string/upload_new_avatar_from_device"
+                android:src="@drawable/upload"
+                app:tint="@color/black" />
 
             <ImageButton
                 android:id="@+id/avatar_choose"
@@ -90,10 +90,10 @@
                 android:layout_height="30dp"
                 android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_marginRight="@dimen/standard_half_margin"
-                android:src="@drawable/ic_mimetype_folder"
                 android:background="@drawable/round_corner"
-                android:tint="@color/colorPrimary"
-                android:contentDescription="@string/choose_avatar_from_cloud" />
+                android:contentDescription="@string/choose_avatar_from_cloud"
+                android:src="@drawable/ic_mimetype_folder"
+                app:tint="@color/colorPrimary" />
 
             <ImageButton
                 android:id="@+id/avatar_delete"
@@ -101,10 +101,10 @@
                 android:layout_height="30dp"
                 android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_marginRight="@dimen/standard_half_margin"
-                android:src="@drawable/trashbin"
-                android:tint="@color/black"
                 android:background="@drawable/round_corner"
-                android:contentDescription="@string/delete_avatar" />
+                android:contentDescription="@string/delete_avatar"
+                android:src="@drawable/trashbin"
+                app:tint="@color/black" />
         </LinearLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/view_message_input.xml b/app/src/main/res/layout/view_message_input.xml
index d64b1a2ad..5aef7d352 100644
--- a/app/src/main/res/layout/view_message_input.xml
+++ b/app/src/main/res/layout/view_message_input.xml
@@ -19,6 +19,7 @@
   -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -57,7 +58,7 @@
             android:layout_toStartOf="@id/messageSendButton"
             android:background="@color/transparent"
             android:src="@drawable/ic_insert_emoticon_black_24dp"
-            android:tint="@color/emoji_icons"
+            app:tint="@color/emoji_icons"
             android:contentDescription="@string/nc_add_emojis" />
 
         <ImageButton
@@ -86,5 +87,4 @@
             android:layout_toStartOf="@id/smileyButton" />
     </RelativeLayout>
 
-
 </merge>
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 1ab9cdd11..246459982 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 3 errors and 338 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 3 errors and 336 warnings</span>