diff --git a/app/src/main/res/layout/activity_edit_entry.xml b/app/src/main/res/layout/activity_edit_entry.xml
index a4d1f3c2..6f3c2fbd 100644
--- a/app/src/main/res/layout/activity_edit_entry.xml
+++ b/app/src/main/res/layout/activity_edit_entry.xml
@@ -46,7 +46,7 @@
                     android:layout_gravity="bottom|end"
                     android:layout_margin="15dp"
                     android:src="@drawable/ic_check_black_24dp"
-                    android:tint="?attr/iconColorPrimary" />
+                    app:tint="?attr/iconColorPrimary" />
             </com.avito.android.krop.KropView>
 
         </RelativeLayout>
@@ -69,7 +69,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_person_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="?attr/iconColorPrimary"
+                    app:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
@@ -125,7 +125,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginStart="14dp"
                 android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
-                android:tint="?attr/iconColorPrimary"/>
+                app:tint="?attr/iconColorPrimary"/>
 
             <TextView
                 android:id="@+id/accordian_title"
@@ -158,7 +158,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_info_outline_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="?attr/iconColorPrimary"
+                    app:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
@@ -209,7 +209,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_timelapse_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="?attr/iconColorPrimary"
+                    app:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
@@ -260,7 +260,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_counter_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="?attr/iconColorPrimary"
+                    app:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
@@ -293,7 +293,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_vpn_key_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="?attr/iconColorPrimary"
+                    app:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d81b2032..5bf353d0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -28,7 +28,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:tint="@color/icon_primary_inverted"
+                app:tint="@color/icon_primary_inverted"
                 android:src="@drawable/ic_alert_black_24dp" />
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_slots.xml b/app/src/main/res/layout/activity_slots.xml
index 036f42a8..c4c80e3f 100644
--- a/app/src/main/res/layout/activity_slots.xml
+++ b/app/src/main/res/layout/activity_slots.xml
@@ -41,7 +41,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_plus_black_24dp"
-                    android:tint="@color/colorAccent"
+                    app:tint="@color/colorAccent"
                     android:layout_marginEnd="15dp"/>
 
                 <TextView
@@ -69,7 +69,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_plus_black_24dp"
-                    android:tint="@color/colorAccent"
+                    app:tint="@color/colorAccent"
                     android:layout_marginEnd="15dp"/>
 
                 <TextView
@@ -98,7 +98,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_info_outline_black_24dp"
-                    android:tint="?attr/iconColorPrimary"
+                    app:tint="?attr/iconColorPrimary"
                     android:layout_marginEnd="15dp"/>
 
                 <TextView
diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index dc3afbea..07aa84bc 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -136,7 +136,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_refresh_black_24dp"
-                android:tint="?attr/iconColorPrimary"
+                app:tint="?attr/iconColorPrimary"
                 android:background="?android:attr/selectableItemBackground" />
 
             <ImageView
diff --git a/app/src/main/res/layout/card_entry_compact.xml b/app/src/main/res/layout/card_entry_compact.xml
index 60c45dcf..293af094 100644
--- a/app/src/main/res/layout/card_entry_compact.xml
+++ b/app/src/main/res/layout/card_entry_compact.xml
@@ -138,7 +138,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_refresh_black_24dp"
-                android:tint="?attr/iconColorPrimary"
+                app:tint="?attr/iconColorPrimary"
                 android:background="?android:attr/selectableItemBackground" />
 
             <ImageView
diff --git a/app/src/main/res/layout/card_entry_small.xml b/app/src/main/res/layout/card_entry_small.xml
index 0c9d4c97..e59b6245 100644
--- a/app/src/main/res/layout/card_entry_small.xml
+++ b/app/src/main/res/layout/card_entry_small.xml
@@ -135,7 +135,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_refresh_black_24dp"
-                android:tint="?attr/iconColorPrimary"
+                app:tint="?attr/iconColorPrimary"
                 android:background="?android:attr/selectableItemBackground" />
 
             <ImageView
diff --git a/app/src/main/res/layout/card_group.xml b/app/src/main/res/layout/card_group.xml
index 4bc91f0d..b81bfdb4 100644
--- a/app/src/main/res/layout/card_group.xml
+++ b/app/src/main/res/layout/card_group.xml
@@ -1,5 +1,6 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
@@ -57,6 +58,6 @@
         android:paddingEnd="15dp"
         android:paddingBottom="12.5dp"
         android:src="@drawable/ic_delete_black_24dp"
-        android:tint="?attr/iconColorPrimary" />
+        app:tint="?attr/iconColorPrimary" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/card_slot.xml b/app/src/main/res/layout/card_slot.xml
index 7ac3277d..40cf9697 100644
--- a/app/src/main/res/layout/card_slot.xml
+++ b/app/src/main/res/layout/card_slot.xml
@@ -1,5 +1,6 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
@@ -20,7 +21,7 @@
 
         <ImageView
             android:id="@+id/img_slot"
-            android:tint="?attr/iconColorPrimary"
+            app:tint="?attr/iconColorPrimary"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginEnd="15dp"/>
@@ -65,7 +66,7 @@
         android:clickable="true"
         android:focusable="true"
         android:src="@drawable/ic_delete_black_24dp"
-        android:tint="?attr/iconColorPrimary"
+        app:tint="?attr/iconColorPrimary"
         android:paddingStart="15dp"
         android:paddingEnd="15dp"
         android:paddingTop="12.5dp"
diff --git a/app/src/main/res/layout/fragment_entry_list_view.xml b/app/src/main/res/layout/fragment_entry_list_view.xml
index fba2f3b7..3e7524f9 100644
--- a/app/src/main/res/layout/fragment_entry_list_view.xml
+++ b/app/src/main/res/layout/fragment_entry_list_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="match_parent"
     android:background="?attr/background"
@@ -43,7 +43,7 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:src="@drawable/ic_qrcode_scan"
-                android:tint="?attr/primaryText" />
+                app:tint="?attr/primaryText" />
 
             <TextView
                 android:id="@+id/textView"