diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index 9df5ccf3a..d48ccccb6 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -77,6 +77,7 @@ class GroupActivity : LockingActivity(),
     private var searchTitleView: View? = null
     private var toolbarPaste: Toolbar? = null
     private var iconView: ImageView? = null
+    private var numberChildrenView: TextView? = null
     private var modeTitleView: TextView? = null
     private var addNodeButtonView: AddNodeButtonView? = null
     private var groupNameView: TextView? = null
@@ -109,7 +110,8 @@ class GroupActivity : LockingActivity(),
         setContentView(layoutInflater.inflate(R.layout.activity_group, null))
 
         // Initialize views
-        iconView = findViewById(R.id.icon)
+        iconView = findViewById(R.id.group_icon)
+        numberChildrenView = findViewById(R.id.group_numbers)
         addNodeButtonView = findViewById(R.id.add_node_button)
         toolbar = findViewById(R.id.toolbar)
         searchTitleView = findViewById(R.id.search_title)
@@ -360,6 +362,16 @@ class GroupActivity : LockingActivity(),
             }
         }
 
+        // Assign number of children
+        numberChildrenView?.apply {
+            if (PreferencesUtil.showNumberEntries(context)) {
+                text = mCurrentGroup?.getChildEntries(true)?.size?.toString() ?: ""
+                visibility = View.VISIBLE
+            } else {
+                visibility = View.GONE
+            }
+        }
+
         // Show selection mode message if needed
         if (mSelectionMode) {
             modeTitleView?.visibility = View.VISIBLE
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 25d6d43d1..eeace1184 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -72,22 +72,39 @@
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:layout_marginStart="6dp"
-                            android:layout_marginEnd="6dp">
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:id="@+id/icon"
-                                android:layout_width="32dp"
-                                android:layout_height="32dp"
-                                android:layout_gravity="end|center_vertical"
-                                android:layout_marginRight="12dp"
-                                android:layout_marginEnd="12dp"
-                                android:scaleType="fitXY" />
+                            android:orientation="horizontal"
+                            android:gravity="center_vertical">
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical">
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:id="@+id/group_icon"
+                                    android:layout_width="32dp"
+                                    android:layout_height="32dp"
+                                    android:layout_gravity="end|center_vertical"
+                                    android:layout_marginStart="6dp"
+                                    android:layout_marginEnd="6dp"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    android:scaleType="fitXY" />
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/group_numbers"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    tools:text="3"
+                                    style="@style/KeepassDXStyle.TextAppearance.Info"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent" />
+                            </androidx.constraintlayout.widget.ConstraintLayout>
                             <androidx.appcompat.widget.AppCompatTextView
                                 android:id="@+id/group_name"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="start|center_vertical"
+                                android:layout_marginLeft="@dimen/image_list_margin"
+                                android:layout_marginStart="@dimen/image_list_margin"
                                 android:layout_weight="1"
                                 android:text="@string/root"
                                 android:maxLines="1"