diff --git a/FAQ.md b/FAQ.md
index cea45cf77e..b13f2de734 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -967,16 +967,15 @@ and I expect that you take responsibility for informing yourself of what you are
 <a name="faq21"></a>
 **(21) How do I enable the notification light?**
 
-Before Android 8 Oreo: there is an advanced option in the setup for this.
+Before Android 8 Oreo: there is an advanced option in the notification settings of the app for this.
+
+Android 8 Oreo and later: please see [here](https://developer.android.com/training/notify-user/channels) about how to configure notification channels.
+You can use the button *Default channel* in the notification settings of the app to directly go to the right Android notification channel settings.
 
-Android 8 Oreo and later: see [here](https://developer.android.com/training/notify-user/channels) about how to configure notification channels.
-You can use the button *Manage notifications* in the setup to directly go to the Android notification settings.
 Note that apps cannot change notification settings, including the notification light setting, on Android 8 Oreo and later anymore.
-Apps designed and targeting older Android versions might still be able to control the contents of notifications,
-but such apps cannot be updated anymore and recent Android versions will show a warning that such apps are outdated.
 
 Sometimes it is necessary to disable the setting *Show message preview in notifications*
-or to enable the settings *Show notifications with a preview text only* to workaround a bug in Android.
+or to enable the settings *Show notifications with a preview text only* to workaround bugs in Android.
 This might apply to notification sounds and vibrations too.
 
 Setting a light color before Android 8 is not supported and on Android 8 and later not possible.
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
index cc9910f046..73b3adddaa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
@@ -87,6 +87,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
     private SwitchCompat swNotifyPreview;
     private SwitchCompat swNotifyPreviewAll;
     private SwitchCompat swNotifyPreviewOnly;
+    private ImageButton ibLight;
     private SwitchCompat swWearablePreview;
     private ImageButton ibWearable;
     private SwitchCompat swMessagingStyle;
@@ -156,6 +157,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
         swNotifyPreview = view.findViewById(R.id.swNotifyPreview);
         swNotifyPreviewAll = view.findViewById(R.id.swNotifyPreviewAll);
         swNotifyPreviewOnly = view.findViewById(R.id.swNotifyPreviewOnly);
+        ibLight = view.findViewById(R.id.ibLight);
         swWearablePreview = view.findViewById(R.id.swWearablePreview);
         ibWearable = view.findViewById(R.id.ibWearable);
         swMessagingStyle = view.findViewById(R.id.swMessagingStyle);
@@ -399,6 +401,13 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
             }
         });
 
+        ibLight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 21);
+            }
+        });
+
         swWearablePreview.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
diff --git a/app/src/main/res/drawable/baseline_wb_incandescent_24.xml b/app/src/main/res/drawable/baseline_wb_incandescent_24.xml
new file mode 100644
index 0000000000..a2bf0dafaa
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_wb_incandescent_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3.55,18.54l1.41,1.41 1.79,-1.8 -1.41,-1.41 -1.79,1.8zM11,22.45h2L13,19.5h-2v2.95zM4,10.5L1,10.5v2h3v-2zM15,6.31L15,1.5L9,1.5v4.81C7.21,7.35 6,9.28 6,11.5c0,3.31 2.69,6 6,6s6,-2.69 6,-6c0,-2.22 -1.21,-4.15 -3,-5.19zM20,10.5v2h3v-2h-3zM17.24,18.16l1.79,1.8 1.41,-1.41 -1.8,-1.79 -1.4,1.4z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index 47bf6c909f..958eced8c9 100644
--- a/app/src/main/res/layout/fragment_options_notifications.xml
+++ b/app/src/main/res/layout/fragment_options_notifications.xml
@@ -511,6 +511,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swNotifyPreviewOnly" />
 
+        <ImageButton
+            android:id="@+id/ibLight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/title_info"
+            android:tooltipText="@string/title_info"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvNotifyPreviewOnlyHint"
+            app:srcCompat="@drawable/baseline_wb_incandescent_24" />
+
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swWearablePreview"
             android:layout_width="0dp"
@@ -519,7 +529,7 @@
             android:text="@string/title_advanced_wearable_preview"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvNotifyPreviewOnlyHint"
+            app:layout_constraintTop_toBottomOf="@id/ibLight"
             app:switchPadding="12dp" />
 
         <eu.faircode.email.FixedTextView