diff --git a/CHANGELOG b/CHANGELOG
index ec85c4568..5519d5a4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ KeePassDX(3.1.0)
  * Add breadcrumb
  * Add path in search results #1148
  * Add group info dialog #1177
+ * Fix UI in Android 8 #509
  * Stop asking WRITE_EXTERNAL_STORAGE permission
 
 KeePassDX(3.0.4)
diff --git a/app/src/main/java/com/kunzisoft/keepass/education/PasswordActivityEducation.kt b/app/src/main/java/com/kunzisoft/keepass/education/PasswordActivityEducation.kt
index 8eed1496b..c3f58180d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/education/PasswordActivityEducation.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/education/PasswordActivityEducation.kt
@@ -38,9 +38,9 @@ class PasswordActivityEducation(activity: Activity)
                         activity.getString(R.string.education_unlock_summary))
                         .outerCircleColorInt(getCircleColor())
                         .outerCircleAlpha(getCircleAlpha())
-                        .icon(ContextCompat.getDrawable(activity, R.mipmap.ic_launcher_round))
+                        .icon(ContextCompat.getDrawable(activity, R.drawable.ic_lock_open_white_24dp))
                         .textColorInt(getTextColor())
-                        .tintTarget(false)
+                        .tintTarget(true)
                         .cancelable(true),
                 object : TapTargetView.Listener() {
                     override fun onTargetClick(view: TapTargetView) {
diff --git a/fastlane/metadata/android/en-US/changelogs/92.txt b/fastlane/metadata/android/en-US/changelogs/92.txt
index eaab7c717..b9869a5e3 100644
--- a/fastlane/metadata/android/en-US/changelogs/92.txt
+++ b/fastlane/metadata/android/en-US/changelogs/92.txt
@@ -1,4 +1,5 @@
  * Add breadcrumb
  * Add path in search results #1148
  * Add group info dialog #1177
+ * Fix UI in Android 8 #509
  * Stop asking WRITE_EXTERNAL_STORAGE permission
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/92.txt b/fastlane/metadata/android/fr-FR/changelogs/92.txt
index d5ba39c39..1499e09d8 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/92.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/92.txt
@@ -1,4 +1,5 @@
  * Ajout d'un fil d'ariane
  * Ajout du chemin pour les résultats de recherche #1148
  * Ajout d'un dialogue pour les informations de groupe #1177
- * Stop asking WRITE_EXTERNAL_STORAGE permission
\ No newline at end of file
+ * Correction de l'interface utilisateur dans Android 8 #509
+ * Ne demande plus la permission WRITE_EXTERNAL_STORAGE permission
\ No newline at end of file