diff --git a/app/src/main/res/drawable/authenticated.xml b/app/src/main/res/drawable/authenticated.xml
index bf42703a60..3d7ea72d45 100644
--- a/app/src/main/res/drawable/authenticated.xml
+++ b/app/src/main/res/drawable/authenticated.xml
@@ -4,15 +4,15 @@
android:drawable="@drawable/twotone_flag_24"
android:maxLevel="0" />
diff --git a/app/src/main/res/drawable/twotone_gpp_bad_24.xml b/app/src/main/res/drawable/twotone_gpp_bad_24.xml
new file mode 100644
index 0000000000..28f2bbb6fb
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_gpp_bad_24.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/twotone_gpp_good_24.xml b/app/src/main/res/drawable/twotone_gpp_good_24.xml
new file mode 100644
index 0000000000..6e5a539229
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_gpp_good_24.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/twotone_shield_24.xml b/app/src/main/res/drawable/twotone_gpp_maybe_24.xml
similarity index 77%
rename from app/src/main/res/drawable/twotone_shield_24.xml
rename to app/src/main/res/drawable/twotone_gpp_maybe_24.xml
index 0782edbf15..fc39401f0b 100644
--- a/app/src/main/res/drawable/twotone_shield_24.xml
+++ b/app/src/main/res/drawable/twotone_gpp_maybe_24.xml
@@ -6,10 +6,10 @@
android:tint="?attr/colorControlNormal">
+ 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.09zM11,16h2v-2h-2V16zM11,12h2V7h-2V12z"/>
diff --git a/app/src/main/res/drawable/twotone_shield_check_24.xml b/app/src/main/res/drawable/twotone_shield_check_24.xml
deleted file mode 100644
index 434e18aa03..0000000000
--- a/app/src/main/res/drawable/twotone_shield_check_24.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/twotone_shield_cross_24.xml b/app/src/main/res/drawable/twotone_shield_cross_24.xml
deleted file mode 100644
index c92fe2300d..0000000000
--- a/app/src/main/res/drawable/twotone_shield_cross_24.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/twotone_shield_warning_24.xml b/app/src/main/res/drawable/twotone_shield_warning_24.xml
deleted file mode 100644
index 6fb409d982..0000000000
--- a/app/src/main/res/drawable/twotone_shield_warning_24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index a5f87afcf4..cb3637adb0 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1459,7 +1459,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="6dp"
- android:drawableStart="@drawable/twotone_shield_cross_24"
+ android:drawableStart="@drawable/twotone_gpp_bad_24"
android:drawablePadding="6dp"
android:drawableTint="?attr/colorSeparator"
android:text="@string/title_advanced_authentication_none"
@@ -1474,7 +1474,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="6dp"
- android:drawableStart="@drawable/twotone_shield_warning_24"
+ android:drawableStart="@drawable/twotone_gpp_maybe_24"
android:drawablePadding="6dp"
android:drawableTint="?attr/colorSeparator"
android:text="@string/title_advanced_authentication_some"
@@ -1489,7 +1489,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="6dp"
- android:drawableStart="@drawable/twotone_shield_check_24"
+ android:drawableStart="@drawable/twotone_gpp_good_24"
android:drawablePadding="6dp"
android:drawableTint="?attr/colorControlNormal"
android:text="@string/title_advanced_authentication_all"