diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index 505248198..edc608d60 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -4,22 +4,26 @@
 
     <SwitchPreference
             android:key="keepUpdated"
+            android:icon="?attr/navigation_refresh"
             android:title="@string/keep_updated"
             android:summary="@string/keep_updated_summary"/>
 
     <Preference
             android:key="authentication"
+            android:icon="?attr/ic_key"
             android:title="@string/authentication_label"
             android:summary="@string/authentication_descr"/>
 
     <ListPreference
             android:key="feedPlaybackSpeed"
+            android:icon="?attr/av_speed"
             android:title="@string/playback_speed"
             android:summary="@string/pref_feed_playback_speed_sum"/>
 
     <ListPreference
             android:entries="@array/spnAutoDeleteItems"
             android:entryValues="@array/spnAutoDeleteValues"
+            android:icon="?attr/content_discard"
             android:title="@string/auto_delete_label"
             android:key="autoDelete"/>
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
index 431eccc8c..f49257174 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
@@ -15,10 +15,6 @@ import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Timer;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
 
 public class DownloadServiceNotification {
     private static final String TAG = "DownloadSvcNotification";
@@ -154,7 +150,7 @@ public class DownloadServiceNotification {
                 .setContentText(context.getText(R.string.authentication_notification_msg))
                 .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getText(R.string.authentication_notification_msg)
                         + ": " + resourceTitle))
-                .setSmallIcon(R.drawable.ic_notification_key)
+                .setSmallIcon(R.drawable.ic_key_white)
                 .setAutoCancel(true)
                 .setContentIntent(ClientConfig.downloadServiceCallbacks.getAuthentificationNotificationContentIntent(context, downloadRequest));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
diff --git a/core/src/main/res/drawable/ic_key_grey600.xml b/core/src/main/res/drawable/ic_key_grey600.xml
new file mode 100644
index 000000000..71cc98f2f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_key_grey600.xml
@@ -0,0 +1,6 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="24dp">
+    <path android:fillColor="#FF757575"
+          android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_notification_key.xml b/core/src/main/res/drawable/ic_key_white.xml
similarity index 100%
rename from core/src/main/res/drawable/ic_notification_key.xml
rename to core/src/main/res/drawable/ic_key_white.xml
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 530b40d46..7745c2bd3 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -52,6 +52,7 @@
     <attr name="ic_select_all" format="reference"/>
     <attr name="ic_select_none" format="reference"/>
     <attr name="ic_sort" format="reference"/>
+    <attr name="ic_key" format="reference"/>
     <attr name="ic_sd_storage" format="reference"/>
     <attr name="ic_create_new_folder" format="reference"/>
     <attr name="ic_cast_disconnect" format="reference"/>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 476ad247a..f4aa88b06 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -74,6 +74,7 @@
         <item name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_grey600_24dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
+        <item name="ic_key">@drawable/ic_key_grey600</item>
         <item name="master_switch_background">@color/master_switch_background_light</item>
         <item name="currently_playing_background">@color/highlight_light</item>
 
@@ -160,6 +161,7 @@
         <item name="ic_bug">@drawable/ic_bug_white_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
+        <item name="ic_key">@drawable/ic_key_white</item>
         <item name="master_switch_background">@color/master_switch_background_dark</item>
         <item name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>