diff --git a/app/src/full/res/layout/main_tab_swap.xml b/app/src/full/res/layout/main_tab_swap.xml
index 1ca688aac..83f4926b5 100644
--- a/app/src/full/res/layout/main_tab_swap.xml
+++ b/app/src/full/res/layout/main_tab_swap.xml
@@ -18,7 +18,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/both_parties_need_fdroid_text"
             android:layout_marginTop="36dp"
-            android:tint="?attr/mainTabSwapSplashTint"
+            app:tint="?attr/mainTabSwapSplashTint"
             android:scaleType="fitXY"
             tools:targetApi="jelly_bean"/>
 
diff --git a/app/src/full/res/layout/swap_peer_list_item.xml b/app/src/full/res/layout/swap_peer_list_item.xml
index 9f474e1cc..f98549b53 100644
--- a/app/src/full/res/layout/swap_peer_list_item.xml
+++ b/app/src/full/res/layout/swap_peer_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="?attr/listPreferredItemHeight"
@@ -20,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:src="@drawable/circle"
-                android:tint="@color/swap_light_grey_icon"/>
+                app:tint="@color/swap_light_grey_icon"/>
 
         <ImageView
                 android:id="@+id/icon"
diff --git a/app/src/main/res/layout-v11/app_permission_item.xml b/app/src/main/res/layout-v11/app_permission_item.xml
index d7256a56e..7fd230b19 100644
--- a/app/src/main/res/layout-v11/app_permission_item.xml
+++ b/app/src/main/res/layout-v11/app_permission_item.xml
@@ -20,6 +20,7 @@
 
 <view class="org.fdroid.fdroid.privileged.views.AppSecurityPermissions$PermissionItemView"
     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"
     android:orientation="horizontal"
@@ -34,7 +35,7 @@
         android:layout_marginRight="8dp"
         android:layout_marginEnd="8dp"
         android:scaleType="fitCenter"
-        android:tint="@android:color/black" />
+        app:tint="@android:color/black" />
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout-v17/app_permission_item_money.xml b/app/src/main/res/layout-v17/app_permission_item_money.xml
index 420225c91..0cca5170d 100644
--- a/app/src/main/res/layout-v17/app_permission_item_money.xml
+++ b/app/src/main/res/layout-v17/app_permission_item_money.xml
@@ -20,6 +20,7 @@
 
 <view class="org.fdroid.fdroid.privileged.views.AppSecurityPermissions$PermissionItemView"
     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"
     android:orientation="horizontal"
@@ -58,7 +59,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignBottom="@+id/perm_money_label"
             android:scaleType="fitCenter"
-            android:tint="@color/perms_costs_money"
+            app:tint="@color/perms_costs_money"
             android:tintMode="src_in"
             android:src="@drawable/ic_coins_s" />
         <TextView
diff --git a/app/src/main/res/layout/main_tab_updates.xml b/app/src/main/res/layout/main_tab_updates.xml
index 622871aa3..f27373dec 100644
--- a/app/src/main/res/layout/main_tab_updates.xml
+++ b/app/src/main/res/layout/main_tab_updates.xml
@@ -55,7 +55,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/empty_state"
-                android:tint="?attr/mainTabSwapSplashTint"
+                app:tint="?attr/mainTabSwapSplashTint"
                 android:scaleType="fitCenter"
                 android:visibility="gone" />