diff --git a/CHANGELOG b/CHANGELOG
index 8db6a7ade..1bb76791b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 KeePassDX(2.6)
  * Share a web domain to automatically search for an entry
+ * Default group icon for a new entry
  * Better autofill recognition
  * Fix entry not visually deleted in search
  * Fix hanged loading dialog
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index aebd7d9f3..8bd935f42 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -166,9 +166,11 @@ class EntryEditActivity : LockingActivity(),
                 mNewEntry = mDatabase?.createEntry()
             }
             mParent = mDatabase?.getGroupById(it)
-            // Add the default icon
-            mDatabase?.drawFactory?.let { iconFactory ->
-                entryEditContentsView?.setDefaultIcon(iconFactory)
+            // Add the default icon from parent
+            mParent?.icon?.let { parentIcon ->
+                temporarilySaveAndShowSelectedIcon(parentIcon)
+            } ?: mDatabase?.drawFactory?.let { iconFactory ->
+                    entryEditContentsView?.setDefaultIcon(iconFactory)
             }
         }
 
diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt
index a5530fc66..5ead6e85f 100644
--- a/fastlane/metadata/android/en-US/changelogs/34.txt
+++ b/fastlane/metadata/android/en-US/changelogs/34.txt
@@ -1,4 +1,5 @@
  * Share a web domain to automatically search for an entry
+ * Default group icon for a new entry
  * Better autofill recognition
  * Fix entry not visually deleted in search
  * Fix hanged loading dialog
diff --git a/fastlane/metadata/android/fr-FR/changelogs/34.txt b/fastlane/metadata/android/fr-FR/changelogs/34.txt
index a04112ed5..25f0cced8 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/34.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/34.txt
@@ -1,4 +1,5 @@
  * Partagez un domaine Web pour rechercher automatiquement une entrée
+ * Icône de groupe par défaut pour une nouvelle entrée
  * Meilleure reconnaissance de remplissage automatique
  * Correction de l'entrée non supprimée visuellement dans la recherche
  * Correction du dialogue de chargement bloqué