diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30df7523..0c0c0b94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 
 -   Cancelling the Autofill "Generate password" action now correctly returns you to the original app.
 -   If multiple username fields exist in the password, we now ensure the later ones are not dropped from extra content.
+-   Icons in Autofill suggestions are no longer black on almost black in dark mode.
 
 ### Changed
 
diff --git a/app/src/main/res/layout/oreo_autofill_dataset.xml b/app/src/main/res/layout/oreo_autofill_dataset.xml
index e13d1688..f420a323 100644
--- a/app/src/main/res/layout/oreo_autofill_dataset.xml
+++ b/app/src/main/res/layout/oreo_autofill_dataset.xml
@@ -4,7 +4,6 @@
   -->
 
 <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="wrap_content"
     android:layout_height="wrap_content"
@@ -26,7 +25,8 @@
         android:adjustViewBounds="true"
         android:maxWidth="20dp"
         android:maxHeight="20dp"
-        app:tint="@color/secondary_color"
+        android:tint="@color/secondary_color"
+        tools:ignore="UseAppTint"
         tools:src="@mipmap/ic_launcher" />
 
     <LinearLayout