diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt b/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt
index c6c143d50038..d53368827357 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt
@@ -339,7 +339,7 @@ open class PrefsRepository(
         get() = getBoolean(R.string.dev_options_enabled_by_user_key, false) || BuildConfig.DEBUG
         set(value) = putBoolean(R.string.dev_options_enabled_by_user_key, value)
 
-    val isNewStudyScreenEnabled by booleanPref(R.string.new_reviewer_options_key, false)
+    var isNewStudyScreenEnabled by booleanPref(R.string.new_reviewer_options_key, false)
 
     val devIsCardBrowserFragmented: Boolean
         get() = getBoolean(R.string.dev_card_browser_fragmented, false)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 3f6421fc88d7..868fa78edc69 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -483,7 +483,7 @@ class ReviewerFragment :
                 connect(
                     R.id.reviewer_menu_view,
                     ConstraintSet.START,
-                    R.id.counts_flow,
+                    R.id.counts_barrier,
                     ConstraintSet.END,
                 )
                 applyTo(binding.toolsLayout)
diff --git a/AnkiDroid/src/main/res/layout-sw720dp/reviewer2.xml b/AnkiDroid/src/main/res/layout-sw720dp/reviewer2.xml
index 866ac37b6f16..6aa6365cf1ba 100644
--- a/AnkiDroid/src/main/res/layout-sw720dp/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout-sw720dp/reviewer2.xml
@@ -152,6 +152,9 @@
                 android:id="@+id/study_counts"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back_button"
+                app:layout_constraintBottom_toTopOf="@id/timer"
                 />
 
             <!-- Timer below counts means UI elements may jump if timer is selectively enabled.
@@ -161,23 +164,20 @@
                 android:id="@+id/timer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintStart_toEndOf="@id/back_button"
+                app:layout_constraintEnd_toEndOf="@id/counts_barrier"
+                app:layout_constraintTop_toBottomOf="@id/study_counts"
+                app:layout_constraintBottom_toBottomOf="parent"
                 android:visibility="gone"
                 tools:visibility="visible"
                 />
 
-            <androidx.constraintlayout.helper.widget.Flow
-                android:id="@+id/counts_flow"
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/counts_barrier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:constraint_referenced_ids="study_counts,timer"
-                app:flow_wrapMode="chain"
-                app:flow_verticalStyle="packed"
-                app:flow_verticalGap="4dp"
-                app:flow_maxElementsWrap="1"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/back_button"
-                />
+                app:barrierDirection="end"
+                app:constraint_referenced_ids="study_counts, timer"/>
 
             <com.ichi2.anki.ui.windows.reviewer.AnswerAreaView
                 android:id="@+id/answer_area"
diff --git a/AnkiDroid/src/main/res/layout/reviewer2.xml b/AnkiDroid/src/main/res/layout/reviewer2.xml
index e0bf704b753e..63c4ef4c273d 100644
--- a/AnkiDroid/src/main/res/layout/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer2.xml
@@ -43,6 +43,9 @@
                 android:id="@+id/study_counts"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back_button"
+                app:layout_constraintBottom_toTopOf="@id/timer"
                 />
 
             <!-- Timer below counts means UI elements may jump if timer is selectively enabled.
@@ -52,23 +55,20 @@
                 android:id="@+id/timer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintStart_toEndOf="@id/back_button"
+                app:layout_constraintEnd_toStartOf="@id/counts_barrier"
+                app:layout_constraintTop_toBottomOf="@id/study_counts"
+                app:layout_constraintBottom_toBottomOf="parent"
                 android:visibility="gone"
                 tools:visibility="visible"
                 />
 
-            <androidx.constraintlayout.helper.widget.Flow
-                android:id="@+id/counts_flow"
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/counts_barrier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:constraint_referenced_ids="study_counts,timer"
-                app:flow_wrapMode="chain"
-                app:flow_verticalStyle="packed"
-                app:flow_verticalGap="4dp"
-                app:flow_maxElementsWrap="1"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/back_button"
-                />
+                app:barrierDirection="end"
+                app:constraint_referenced_ids="study_counts, timer"/>
 
             <com.ichi2.anki.preferences.reviewer.ReviewerMenuView
                 android:id="@+id/reviewer_menu_view"
@@ -76,7 +76,7 @@
                 android:layout_height="0dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/counts_flow"
+                app:layout_constraintStart_toEndOf="@id/counts_barrier"
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_marginStart="12dp"/>
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenScreenshotTest.kt
index e8700eac8bf9..f9f0899c38ad 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenScreenshotTest.kt
@@ -35,6 +35,7 @@ class StudyScreenScreenshotTest(
     private val config: TestConfig,
 ) : ScreenshotTest() {
     init {
+        Prefs.isNewStudyScreenEnabled = true
         Prefs.toolbarPosition = config.toolbarPosition
         Prefs.showAnswerButtons = config.showAnswerButtons
         Prefs.frameStyle = config.frameStyle