diff --git a/lib/java/com/google/android/material/textfield/TextInputLayout.java b/lib/java/com/google/android/material/textfield/TextInputLayout.java
index 44e0e926c..5c3b986a0 100644
--- a/lib/java/com/google/android/material/textfield/TextInputLayout.java
+++ b/lib/java/com/google/android/material/textfield/TextInputLayout.java
@@ -3591,7 +3591,7 @@ public class TextInputLayout extends LinearLayout {
         colorStateList.getColorForState(this.getDrawableState(), colorStateList.getDefaultColor());
 
     icon = DrawableCompat.wrap(icon).mutate();
-    DrawableCompat.setTint(icon, color);
+    DrawableCompat.setTintList(icon, ColorStateList.valueOf(color));
     iconView.setImageDrawable(icon);
   }
 
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-hdpi/design_ic_visibility.png b/lib/java/com/google/android/material/textfield/res/drawable-hdpi/design_ic_visibility.png
deleted file mode 100644
index 329e617e9..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-hdpi/design_ic_visibility.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-hdpi/design_ic_visibility_off.png b/lib/java/com/google/android/material/textfield/res/drawable-hdpi/design_ic_visibility_off.png
deleted file mode 100644
index b21a68629..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-hdpi/design_ic_visibility_off.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-mdpi/design_ic_visibility.png b/lib/java/com/google/android/material/textfield/res/drawable-mdpi/design_ic_visibility.png
deleted file mode 100644
index 58597e91b..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-mdpi/design_ic_visibility.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-mdpi/design_ic_visibility_off.png b/lib/java/com/google/android/material/textfield/res/drawable-mdpi/design_ic_visibility_off.png
deleted file mode 100644
index 3efdf4922..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-mdpi/design_ic_visibility_off.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-v21/design_password_eye.xml b/lib/java/com/google/android/material/textfield/res/drawable-v21/design_password_eye.xml
deleted file mode 100644
index 9ae34af1f..000000000
--- a/lib/java/com/google/android/material/textfield/res/drawable-v21/design_password_eye.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/visible"
-        android:drawable="@drawable/design_ic_visibility"
-        android:state_checked="true"/>
-
-    <item
-        android:id="@+id/masked"
-        android:drawable="@drawable/design_ic_visibility_off"/>
-
-    <transition
-        android:drawable="@drawable/avd_show_password"
-        android:fromId="@id/masked"
-        android:toId="@id/visible"/>
-
-    <transition
-        android:drawable="@drawable/avd_hide_password"
-        android:fromId="@id/visible"
-        android:toId="@id/masked"/>
-
-</animated-selector>
-
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-xhdpi/design_ic_visibility.png b/lib/java/com/google/android/material/textfield/res/drawable-xhdpi/design_ic_visibility.png
deleted file mode 100644
index 1f7b4cc8f..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-xhdpi/design_ic_visibility.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-xhdpi/design_ic_visibility_off.png b/lib/java/com/google/android/material/textfield/res/drawable-xhdpi/design_ic_visibility_off.png
deleted file mode 100644
index 46bf0c931..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-xhdpi/design_ic_visibility_off.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-xxhdpi/design_ic_visibility.png b/lib/java/com/google/android/material/textfield/res/drawable-xxhdpi/design_ic_visibility.png
deleted file mode 100644
index c816ab49d..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-xxhdpi/design_ic_visibility.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-xxhdpi/design_ic_visibility_off.png b/lib/java/com/google/android/material/textfield/res/drawable-xxhdpi/design_ic_visibility_off.png
deleted file mode 100644
index 13eb65df3..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-xxhdpi/design_ic_visibility_off.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-xxxhdpi/design_ic_visibility.png b/lib/java/com/google/android/material/textfield/res/drawable-xxxhdpi/design_ic_visibility.png
deleted file mode 100644
index e005b976c..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-xxxhdpi/design_ic_visibility.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-xxxhdpi/design_ic_visibility_off.png b/lib/java/com/google/android/material/textfield/res/drawable-xxxhdpi/design_ic_visibility_off.png
deleted file mode 100644
index ce3c9d84d..000000000
Binary files a/lib/java/com/google/android/material/textfield/res/drawable-xxxhdpi/design_ic_visibility_off.png and /dev/null differ
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-v21/avd_hide_password.xml b/lib/java/com/google/android/material/textfield/res/drawable/avd_hide_password.xml
similarity index 95%
rename from lib/java/com/google/android/material/textfield/res/drawable-v21/avd_hide_password.xml
rename to lib/java/com/google/android/material/textfield/res/drawable/avd_hide_password.xml
index ff1e51981..89f4cddfa 100644
--- a/lib/java/com/google/android/material/textfield/res/drawable-v21/avd_hide_password.xml
+++ b/lib/java/com/google/android/material/textfield/res/drawable/avd_hide_password.xml
@@ -17,7 +17,9 @@
 
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
+    xmlns:aapt="http://schemas.android.com/aapt"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="NewApi">
 
   <aapt:attr name="android:drawable">
 
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-v21/avd_show_password.xml b/lib/java/com/google/android/material/textfield/res/drawable/avd_show_password.xml
similarity index 95%
rename from lib/java/com/google/android/material/textfield/res/drawable-v21/avd_show_password.xml
rename to lib/java/com/google/android/material/textfield/res/drawable/avd_show_password.xml
index 4a00cf763..aed3983bd 100644
--- a/lib/java/com/google/android/material/textfield/res/drawable-v21/avd_show_password.xml
+++ b/lib/java/com/google/android/material/textfield/res/drawable/avd_show_password.xml
@@ -17,7 +17,9 @@
 
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
+    xmlns:aapt="http://schemas.android.com/aapt"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="NewApi">
 
   <aapt:attr name="android:drawable">
 
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-anydpi-v21/design_ic_visibility.xml b/lib/java/com/google/android/material/textfield/res/drawable/design_ic_visibility.xml
similarity index 92%
rename from lib/java/com/google/android/material/textfield/res/drawable-anydpi-v21/design_ic_visibility.xml
rename to lib/java/com/google/android/material/textfield/res/drawable/design_ic_visibility.xml
index c2a847812..078630f4e 100644
--- a/lib/java/com/google/android/material/textfield/res/drawable-anydpi-v21/design_ic_visibility.xml
+++ b/lib/java/com/google/android/material/textfield/res/drawable/design_ic_visibility.xml
@@ -16,6 +16,8 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="NewApi"
     android:height="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
diff --git a/lib/java/com/google/android/material/textfield/res/drawable-anydpi-v21/design_ic_visibility_off.xml b/lib/java/com/google/android/material/textfield/res/drawable/design_ic_visibility_off.xml
similarity index 95%
rename from lib/java/com/google/android/material/textfield/res/drawable-anydpi-v21/design_ic_visibility_off.xml
rename to lib/java/com/google/android/material/textfield/res/drawable/design_ic_visibility_off.xml
index 3c5f23be9..30c361f06 100644
--- a/lib/java/com/google/android/material/textfield/res/drawable-anydpi-v21/design_ic_visibility_off.xml
+++ b/lib/java/com/google/android/material/textfield/res/drawable/design_ic_visibility_off.xml
@@ -16,6 +16,8 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="NewApi"
     android:height="24dp"
     android:viewportHeight="24"
     android:viewportWidth="24"
diff --git a/lib/java/com/google/android/material/textfield/res/drawable/design_password_eye.xml b/lib/java/com/google/android/material/textfield/res/drawable/design_password_eye.xml
index 1acf283f5..e5d4e0c7b 100644
--- a/lib/java/com/google/android/material/textfield/res/drawable/design_password_eye.xml
+++ b/lib/java/com/google/android/material/textfield/res/drawable/design_password_eye.xml
@@ -15,13 +15,28 @@
   ~ limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="NewApi">
 
-  <item
-      android:drawable="@drawable/design_ic_visibility"
-      android:state_checked="true"/>
+    <item
+        android:id="@+id/visible"
+        android:drawable="@drawable/design_ic_visibility"
+        android:state_checked="true"/>
 
-  <item
-      android:drawable="@drawable/design_ic_visibility_off"/>
+    <item
+        android:id="@+id/masked"
+        android:drawable="@drawable/design_ic_visibility_off"/>
+
+    <transition
+        android:drawable="@drawable/avd_show_password"
+        android:fromId="@id/masked"
+        android:toId="@id/visible"/>
+
+    <transition
+        android:drawable="@drawable/avd_hide_password"
+        android:fromId="@id/visible"
+        android:toId="@id/masked"/>
+
+</animated-selector>
 
-</selector>