diff --git a/src/main/res/layout/control_set_clear_button.xml b/src/main/res/layout/control_set_clear_button.xml
index 90f6d33db..0ec8f5c5e 100644
--- a/src/main/res/layout/control_set_clear_button.xml
+++ b/src/main/res/layout/control_set_clear_button.xml
@@ -9,4 +9,4 @@
     android:background="?attr/selectableItemBackgroundBorderless"
     android:clickable="true"
     android:src="@drawable/ic_cancel_24dp"
-    android:tint="?attr/colorControlNormal" />
\ No newline at end of file
+    android:tint="?attr/icon_tint" />
\ No newline at end of file
diff --git a/src/main/res/layout/control_set_template.xml b/src/main/res/layout/control_set_template.xml
index 0cffd4eb6..ec77740ca 100644
--- a/src/main/res/layout/control_set_template.xml
+++ b/src/main/res/layout/control_set_template.xml
@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:tint="?attr/colorControlNormal"
+        android:tint="?attr/icon_tint"
         android:alpha="?attr/alpha_secondary"
         android:paddingRight="@dimen/keyline_second"
         android:paddingEnd="@dimen/keyline_second"
diff --git a/src/main/res/layout/control_set_timers.xml b/src/main/res/layout/control_set_timers.xml
index 6b37700dc..b94cc568f 100644
--- a/src/main/res/layout/control_set_timers.xml
+++ b/src/main/res/layout/control_set_timers.xml
@@ -42,7 +42,7 @@
             android:paddingRight="5dip"
             android:alpha="?attr/alpha_secondary"
             android:scaleType="centerInside"
-            android:tint="?attr/colorControlNormal" />
+            android:tint="?attr/icon_tint" />
 
         <Chronometer
             android:id="@+id/timer"
diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml
index 76fe26406..4a78ee891 100644
--- a/src/main/res/layout/filter_adapter_row.xml
+++ b/src/main/res/layout/filter_adapter_row.xml
@@ -34,7 +34,7 @@
             android:id="@+id/icon"
             android:layout_width="56dp"
             android:layout_height="wrap_content"
-            android:tint="?attr/colorControlNormal"
+            android:tint="?attr/icon_tint"
             android:alpha="?attr/alpha_secondary"
             android:scaleType="fitStart" />
 
diff --git a/src/main/res/layout/tag_edit_row.xml b/src/main/res/layout/tag_edit_row.xml
index d835e8068..304be7110 100644
--- a/src/main/res/layout/tag_edit_row.xml
+++ b/src/main/res/layout/tag_edit_row.xml
@@ -30,7 +30,7 @@
 
     <ImageView
         android:id="@+id/button1"
-        android:tint="?attr/colorControlNormal"
+        android:tint="?attr/icon_tint"
         android:src="@drawable/ic_close_24dp"
         android:contentDescription="@string/remove"
         android:layout_gravity="center_vertical"
diff --git a/src/main/res/layout/task_list_body_empty.xml b/src/main/res/layout/task_list_body_empty.xml
index decd09205..cc2b18bf3 100644
--- a/src/main/res/layout/task_list_body_empty.xml
+++ b/src/main/res/layout/task_list_body_empty.xml
@@ -21,7 +21,7 @@
                 android:layout_gravity="center"
                 android:alpha="?attr/alpha_disabled"
                 android:src="@drawable/ic_inbox_168px"
-                android:tint="?attr/colorControlNormal" />
+                android:tint="?attr/icon_tint" />
 
             <TextView
                 android:id="@+id/empty_text"
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index b69c54bde..9c2c59b3d 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -11,6 +11,7 @@
     <attr name="asContentBackground" format="color" />
     <attr name="asTextColor" format="color" />
     <attr name="asTextColorHint" format="color" />
+    <attr name="icon_tint" format="color"/>
     <attr name="popup_theme" format="reference" />
 
     <attr name="alpha_primary" format="dimension" />
diff --git a/src/main/res/values/theme_base_dark.xml b/src/main/res/values/theme_base_dark.xml
index 87a9961ed..1cf69b7ac 100644
--- a/src/main/res/values/theme_base_dark.xml
+++ b/src/main/res/values/theme_base_dark.xml
@@ -10,6 +10,7 @@
         <item name="asContentBackground">@color/md_dark_background</item>
         <item name="asTextColor">@android:color/white</item>
         <item name="asTextColorHint">@android:color/darker_gray</item>
+        <item name="icon_tint">@android:color/white</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/DialogBaseDark</item>
@@ -26,6 +27,7 @@
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="asTextColor">@android:color/white</item>
+        <item name="icon_tint">@android:color/white</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/theme_base_light.xml b/src/main/res/values/theme_base_light.xml
index 29834a3f1..f03b800e1 100644
--- a/src/main/res/values/theme_base_light.xml
+++ b/src/main/res/values/theme_base_light.xml
@@ -10,6 +10,7 @@
         <item name="asContentBackground">@color/md_light_background</item>
         <item name="asTextColor">@android:color/black</item>
         <item name="asTextColorHint">@android:color/darker_gray</item>
+        <item name="icon_tint">@android:color/black</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/LightDialogBase</item>
@@ -26,6 +27,7 @@
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="asTextColor">@android:color/black</item>
+        <item name="icon_tint">@android:color/black</item>
     </style>
 
 </resources>
\ No newline at end of file