diff --git a/app/src/full/res/drawable/ic_delete.xml b/app/src/full/res/drawable/ic_delete.xml
index 9b7a8c7e5..1b1b7d364 100644
--- a/app/src/full/res/drawable/ic_delete.xml
+++ b/app/src/full/res/drawable/ic_delete.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="?attr/imageColorTint"
+        android:fillColor="?attr/colorControl"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
diff --git a/app/src/full/res/drawable/ic_refresh.xml b/app/src/full/res/drawable/ic_refresh.xml
index 635d77eb9..33b0d7d1b 100644
--- a/app/src/full/res/drawable/ic_refresh.xml
+++ b/app/src/full/res/drawable/ic_refresh.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="?attr/imageColorTint"
+        android:fillColor="?attr/colorControl"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
 </vector>
diff --git a/app/src/full/res/drawable/ic_save.xml b/app/src/full/res/drawable/ic_save.xml
index 194ffafd4..fed1b783b 100644
--- a/app/src/full/res/drawable/ic_save.xml
+++ b/app/src/full/res/drawable/ic_save.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="?attr/imageColorTint"
+        android:fillColor="?attr/colorControl"
         android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
 </vector>
diff --git a/app/src/full/res/drawable/ic_sort.xml b/app/src/full/res/drawable/ic_sort.xml
index 0fd497923..c872f6bd2 100644
--- a/app/src/full/res/drawable/ic_sort.xml
+++ b/app/src/full/res/drawable/ic_sort.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/imageColorTint"
+        android:fillColor="?attr/colorControl"
         android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
 </vector>
diff --git a/app/src/full/res/values-v19/styles.xml b/app/src/full/res/values-v19/styles.xml
index 785a6291e..540c78fc2 100644
--- a/app/src/full/res/values-v19/styles.xml
+++ b/app/src/full/res/values-v19/styles.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@drawable/ic_splash_activity</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowTranslucentNavigation">true</item>
     </style>
diff --git a/app/src/full/res/values/attrs.xml b/app/src/full/res/values/attrs.xml
index fee7783ab..b6b8c507e 100644
--- a/app/src/full/res/values/attrs.xml
+++ b/app/src/full/res/values/attrs.xml
@@ -3,4 +3,5 @@
     <attr name="cardStyle" format="reference"/>
     <attr name="colorAccentFallback" format="reference" />
     <attr name="imageColorTint" format="reference" />
+    <attr name="colorControl" format="reference"/>
 </resources>
diff --git a/app/src/full/res/values/styles.xml b/app/src/full/res/values/styles.xml
index 162718e9b..66e60ea8a 100644
--- a/app/src/full/res/values/styles.xml
+++ b/app/src/full/res/values/styles.xml
@@ -9,7 +9,8 @@
         <item name="cardStyle">@style/CardViewStyle.Light</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="imageColorTint">@android:color/tertiary_text_light</item>
+        <item name="imageColorTint">@color/icon_grey</item>
+        <item name="colorControl">?android:colorControlNormal</item>
     </style>
 
     <style name="AppTheme" parent="AppTheme.Base"/>
@@ -23,6 +24,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:textColorSecondary">@color/dark_secondary_text</item>
         <item name="imageColorTint">@color/dark_secondary_text</item>
+        <item name="colorControl">?android:colorControlNormal</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Dark.Base"/>