diff --git a/app/src/main/res/drawable/authenticated.xml b/app/src/main/res/drawable/authenticated.xml
index 3d7ea72d45..6465c1705e 100644
--- a/app/src/main/res/drawable/authenticated.xml
+++ b/app/src/main/res/drawable/authenticated.xml
@@ -4,7 +4,7 @@
         android:drawable="@drawable/twotone_flag_24"
         android:maxLevel="0" />
     <item
-        android:drawable="@drawable/twotone_gpp_bad_24"
+        android:drawable="@drawable/twotone_gpp_question_24"
         android:maxLevel="1" />
     <item
         android:drawable="@drawable/twotone_gpp_maybe_24"
diff --git a/app/src/main/res/drawable/twotone_gpp_question_24.xml b/app/src/main/res/drawable/twotone_gpp_question_24.xml
new file mode 100644
index 0000000000..3dee5443df
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_gpp_question_24.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="@android:color/white"
+        android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39z"
+        android:strokeAlpha="0.3" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09z" />
+    <group
+        android:scaleX="0.5"
+        android:scaleY="0.5"
+        android:translateX="6"
+        android:translateY="6">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M11.07,12.85c0.77,-1.39 2.25,-2.21 3.11,-3.44c0.91,-1.29 0.4,-3.7 -2.18,-3.7c-1.69,0 -2.52,1.28 -2.87,2.34L6.54,6.96C7.25,4.83 9.18,3 11.99,3c2.35,0 3.96,1.07 4.78,2.41c0.7,1.15 1.11,3.3 0.03,4.9c-1.2,1.77 -2.35,2.31 -2.97,3.45c-0.25,0.46 -0.35,0.76 -0.35,2.24h-2.89C10.58,15.22 10.46,13.95 11.07,12.85zM14,20c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2S14,18.9 14,20z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 3f48cfdfe0..195cf7fc38 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1810,22 +1810,6 @@
                     app:layout_constraintTop_toBottomOf="@id/tvAuthenticationHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvAuthNone"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="6dp"
-                    android:drawableStart="@drawable/twotone_gpp_bad_24"
-                    android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorControlNormal"
-                    android:text="@string/title_advanced_authentication_none"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textStyle="italic"
-                    android:visibility="gone"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swAuthenticationIndicator" />
-
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvAuthSome"
                     android:layout_width="wrap_content"
@@ -1839,7 +1823,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="italic"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvAuthNone" />
+                    app:layout_constraintTop_toBottomOf="@id/swAuthenticationIndicator" />
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvAutheAll"