diff --git a/app/src/main/res/color/color_icons.xml b/app/src/main/res/color/color_icons.xml
new file mode 100644
index 0000000000000000000000000000000000000000..42d390528bf34e6af0f7dd2fc7c1cae295952867
--- /dev/null
+++ b/app/src/main/res/color/color_icons.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2018 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="?colorAccent" android:state_focused="true" />
+  <item android:alpha="1.00" android:color="?colorTextSecondary" android:state_hovered="true" />
+  <item android:alpha="0.38" android:color="?colorTextSecondary" android:state_enabled="false" />
+  <item android:alpha="0.87" android:color="?colorTextSecondary" />
+</selector>
diff --git a/app/src/main/res/color/color_indicator.xml b/app/src/main/res/color/color_indicator.xml
deleted file mode 100644
index 7ade179a931579eb6d893e145d0bb1e0dc3c46b7..0000000000000000000000000000000000000000
--- a/app/src/main/res/color/color_indicator.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="?attr/colorAccent" android:state_activated="true" />
-  <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false" />
-  <item android:alpha="0.6" android:color="?attr/colorOnSurface" />
-</selector>
diff --git a/app/src/main/res/drawable/bg_spinner.xml b/app/src/main/res/drawable/bg_spinner.xml
deleted file mode 100644
index 60a856a1d0775926aa2eea7ebd14d6d62f688d2e..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/bg_spinner.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <corners android:radius="4dp" />
-  <stroke
-    android:width="1dp"
-    android:color="@color/color_indicator" />
-</shape>
diff --git a/app/src/main/res/layout/widget_material_spinner_label.xml b/app/src/main/res/layout/widget_material_spinner_label.xml
deleted file mode 100644
index 5c6b555c9f9b7337a149eb582622583a4b60355a..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/widget_material_spinner_label.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/spinner_label"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  android:layout_gravity="start|top"
-  android:layout_marginStart="8dp"
-  android:layout_marginLeft="8dp"
-  android:letterSpacing="0.0333333333"
-  android:paddingLeft="4dp"
-  android:paddingRight="4dp"
-  android:textColor="@color/color_indicator"
-  android:textSize="12sp"
-  tools:ignore="UnusedAttribute"
-  tools:text="Name" />
diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml
index 20bb9617882996d5929be74f31e1329225284a8f..12b73b3c2ef6886c5d37a87efdb144f1dda82e7e 100644
--- a/app/src/main/res/values/styles_widgets.xml
+++ b/app/src/main/res/values/styles_widgets.xml
@@ -134,6 +134,7 @@
     <item name="android:textColorHint">?colorTextSecondary</item>
     <item name="hintTextColor">?colorAccent</item>
     <item name="boxStrokeColor">@color/color_outlined_stroke</item>
+    <item name="passwordToggleTint">@color/color_icons</item>
   </style>
 
   <style name="Widget.CoreSettings.Wrapper" parent="">