diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
index 8e727778a90..70c4f3882d0 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
@@ -28,6 +28,7 @@
 import androidx.activity.OnBackPressedCallback;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -605,6 +606,12 @@ private void refreshView(boolean isGoingUp) {
                 groupIcon.setVisibility(View.VISIBLE);
                 groupPathTextView.setVisibility(View.VISIBLE);
                 groupPathTextView.setText(getCurrentPath());
+
+                if (formController.indexContainsRepeatableGroup() || shouldShowRepeatGroupPicker()) {
+                    groupIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_repeat));
+                } else {
+                    groupIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_folder_open));
+                }
             }
 
             // Refresh the current event in case we did step forward.
diff --git a/collect_app/src/main/res/layout/hierarchy_layout.xml b/collect_app/src/main/res/layout/hierarchy_layout.xml
index 3ca287d2278..6db0f6c417c 100644
--- a/collect_app/src/main/res/layout/hierarchy_layout.xml
+++ b/collect_app/src/main/res/layout/hierarchy_layout.xml
@@ -16,9 +16,9 @@
         android:layout_marginStart="@dimen/margin_standard"
         android:layout_marginTop="@dimen/margin_small"
         android:visibility="gone"
-        app:srcCompat="@drawable/ic_folder_open"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appBarLayout"
+        tools:srcCompat="@drawable/ic_folder_open"
         tools:visibility="visible" />
 
     <TextView