diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 613c094e4a..b199a6a9cd 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -606,7 +606,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
     // Determine the validation result, which will be displayed on the item itself
     val validationResult =
       if (modifiedQuestionnaireResponseItemSet.contains(questionnaireResponseItem) ||
-          forceValidation
+          forceValidation ||
+          isInReviewModeFlow.value
       ) {
         QuestionnaireResponseItemValidator.validate(
           questionnaireItem,
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreHeaderViews.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreHeaderViews.kt
new file mode 100644
index 0000000000..a0e80f273c
--- /dev/null
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreHeaderViews.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture.extensions
+
+import android.text.Spanned
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.Button
+import android.widget.TextView
+import com.google.android.fhir.datacapture.hasHelpButton
+import com.google.android.fhir.datacapture.localizedHelpSpanned
+import com.google.android.material.card.MaterialCardView
+import org.hl7.fhir.r4.model.Questionnaire
+
+internal fun TextView.updateTextAndVisibility(localizedText: Spanned? = null) {
+  text = localizedText
+  visibility =
+    if (localizedText.isNullOrEmpty()) {
+      GONE
+    } else {
+      VISIBLE
+    }
+}
+
+/** Returns [VISIBLE] if any of the [view] is visible, [GONE] otherwise. */
+internal fun getHeaderViewVisibility(vararg view: TextView): Int {
+  if (view.any { it.visibility == VISIBLE }) {
+    return VISIBLE
+  }
+  return GONE
+}
+
+/**
+ * Initializes the text for [helpTextView] with instructions on how to use the feature, and sets the
+ * visibility and click listener for the [helpButton] to allow users to access the help information
+ * and toggles the visibility for view [helpCardView].
+ */
+internal fun initHelpViews(
+  helpButton: Button,
+  helpCardView: MaterialCardView,
+  helpTextView: TextView,
+  questionnaireItem: Questionnaire.QuestionnaireItemComponent
+) {
+  helpButton.visibility =
+    if (questionnaireItem.hasHelpButton) {
+      VISIBLE
+    } else {
+      GONE
+    }
+  helpButton.setOnClickListener {
+    helpCardView.visibility =
+      when (helpCardView.visibility) {
+        VISIBLE -> GONE
+        else -> VISIBLE
+      }
+  }
+  helpTextView.updateTextAndVisibility(questionnaireItem.localizedHelpSpanned)
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
index f507c0340a..b149345343 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
@@ -22,6 +22,9 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.extensions.getHeaderViewVisibility
+import com.google.android.fhir.datacapture.extensions.initHelpViews
+import com.google.android.fhir.datacapture.extensions.updateTextAndVisibility
 import com.google.android.fhir.datacapture.localizedInstructionsSpanned
 import com.google.android.fhir.datacapture.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
@@ -38,10 +41,15 @@ internal class GroupHeaderView(context: Context, attrs: AttributeSet?) :
     val prefix = findViewById<TextView>(R.id.prefix)
     val question = findViewById<TextView>(R.id.question)
     val hint = findViewById<TextView>(R.id.hint)
-    initHelpButton(this, questionnaireItem)
+    initHelpViews(
+      helpButton = findViewById(R.id.helpButton),
+      helpCardView = findViewById(R.id.helpCardView),
+      helpTextView = findViewById(R.id.helpText),
+      questionnaireItem
+    )
     prefix.updateTextAndVisibility(questionnaireItem.localizedPrefixSpanned)
     question.updateTextAndVisibility(questionnaireItem.localizedTextSpanned)
     hint.updateTextAndVisibility(questionnaireItem.localizedInstructionsSpanned)
-    visibility = getViewGroupVisibility(prefix, question, hint)
+    visibility = getHeaderViewVisibility(prefix, question, hint)
   }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
index bc7cc984d2..79fef23e70 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
@@ -17,22 +17,17 @@
 package com.google.android.fhir.datacapture.views
 
 import android.content.Context
-import android.text.Spanned
 import android.util.AttributeSet
 import android.view.LayoutInflater
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
-import com.google.android.fhir.datacapture.hasHelpButton
-import com.google.android.fhir.datacapture.localizedHelpSpanned
+import com.google.android.fhir.datacapture.extensions.getHeaderViewVisibility
+import com.google.android.fhir.datacapture.extensions.initHelpViews
+import com.google.android.fhir.datacapture.extensions.updateTextAndVisibility
 import com.google.android.fhir.datacapture.localizedInstructionsSpanned
 import com.google.android.fhir.datacapture.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
-import com.google.android.material.card.MaterialCardView
 import org.hl7.fhir.r4.model.Questionnaire
 
 /** View for the prefix, question, and hint of a questionnaire item. */
@@ -51,10 +46,15 @@ internal class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout
     prefix.updateTextAndVisibility(questionnaireItem.localizedPrefixSpanned)
     question.updateTextAndVisibility(questionnaireItem.localizedTextSpanned)
     hint.updateTextAndVisibility(questionnaireItem.localizedInstructionsSpanned)
-    initHelpButton(this, questionnaireItem)
+    initHelpViews(
+      helpButton = findViewById(R.id.helpButton),
+      helpCardView = findViewById(R.id.helpCardView),
+      helpTextView = findViewById(R.id.helpText),
+      questionnaireItem
+    )
     //   Make the entire view GONE if there is nothing to show. This is to avoid an empty row in the
     // questionnaire.
-    visibility = getViewGroupVisibility(prefix, question, hint)
+    visibility = getHeaderViewVisibility(prefix, question, hint)
   }
 
   /**
@@ -74,49 +74,3 @@ internal class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout
     errorTextView.text = errorText
   }
 }
-
-internal fun TextView.updateTextAndVisibility(localizedText: Spanned? = null) {
-  text = localizedText
-  visibility =
-    if (localizedText.isNullOrEmpty()) {
-      GONE
-    } else {
-      VISIBLE
-    }
-}
-
-/** Returns [VISIBLE] if any of the [view] is visible, else returns [GONE]. */
-internal fun getViewGroupVisibility(vararg view: TextView): Int {
-  if (view.any { it.visibility == VISIBLE }) {
-    return VISIBLE
-  }
-  return GONE
-}
-
-internal fun initHelpButton(
-  view: View,
-  questionnaireItem: Questionnaire.QuestionnaireItemComponent
-) {
-  val helpButton = view.findViewById<Button>(R.id.helpButton)
-  helpButton.visibility =
-    if (questionnaireItem.hasHelpButton) {
-      VISIBLE
-    } else {
-      GONE
-    }
-  val helpCardView = view.findViewById<MaterialCardView>(R.id.helpCardView)
-  var isHelpCardViewVisible = false
-  helpButton.setOnClickListener {
-    if (isHelpCardViewVisible) {
-      isHelpCardViewVisible = false
-      helpCardView.visibility = GONE
-    } else {
-      isHelpCardViewVisible = true
-      helpCardView.visibility = VISIBLE
-    }
-  }
-
-  view
-    .findViewById<TextView>(R.id.helpText)
-    .updateTextAndVisibility(questionnaireItem.localizedHelpSpanned)
-}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
index ae81f99fb8..acb262ae40 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
@@ -20,9 +20,15 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.extensions.getHeaderViewVisibility
+import com.google.android.fhir.datacapture.extensions.updateTextAndVisibility
 import com.google.android.fhir.datacapture.localizedFlyoverSpanned
-import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.localizedInstructionsSpanned
+import com.google.android.fhir.datacapture.localizedPrefixSpanned
+import com.google.android.fhir.datacapture.localizedTextSpanned
+import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.divider.MaterialDivider
 import org.hl7.fhir.r4.model.Questionnaire
@@ -34,21 +40,39 @@ import org.hl7.fhir.r4.model.Questionnaire
 internal object ReviewViewHolderFactory : QuestionnaireItemViewHolderFactory(R.layout.review_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: HeaderView
+      private lateinit var header: ConstraintLayout
       private lateinit var flyOverTextView: TextView
-      private lateinit var answerTextView: TextView
+      private lateinit var errorView: View
+      private lateinit var answerView: TextView
       private lateinit var divider: MaterialDivider
+      private lateinit var prefix: TextView
+      private lateinit var question: TextView
+      private lateinit var hint: TextView
       override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
         flyOverTextView = itemView.findViewById(R.id.flyover_text_view)
-        answerTextView = itemView.findViewById(R.id.answer_text_view)
         divider = itemView.findViewById(R.id.text_divider)
+        prefix = itemView.findViewById(R.id.prefix)
+        question = itemView.findViewById(R.id.question)
+        hint = itemView.findViewById(R.id.hint)
+        errorView = itemView.findViewById(R.id.error_view)
+        answerView = itemView.findViewById(R.id.answer_text_view)
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        header.bind(questionnaireViewItem.questionnaireItem)
+        prefix.updateTextAndVisibility(
+          questionnaireViewItem.questionnaireItem.localizedPrefixSpanned
+        )
+        question.updateTextAndVisibility(
+          questionnaireViewItem.questionnaireItem.localizedTextSpanned
+        )
+        hint.updateTextAndVisibility(
+          questionnaireViewItem.questionnaireItem.localizedInstructionsSpanned
+        )
+        header.visibility = getHeaderViewVisibility(prefix, question, hint)
+
         val localizedFlyoverSpanned =
           questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
         flyOverTextView.apply {
@@ -60,21 +84,30 @@ internal object ReviewViewHolderFactory : QuestionnaireItemViewHolderFactory(R.l
             }
           text = localizedFlyoverSpanned
         }
-
-        answerTextView.apply {
-          visibility =
-            when (questionnaireViewItem.questionnaireItem.type) {
-              Questionnaire.QuestionnaireItemType.GROUP,
-              Questionnaire.QuestionnaireItemType.DISPLAY -> GONE
-              else -> VISIBLE
+        when (questionnaireViewItem.questionnaireItem.type) {
+          Questionnaire.QuestionnaireItemType.GROUP,
+          Questionnaire.QuestionnaireItemType.DISPLAY -> {
+            errorView.visibility = GONE
+            answerView.visibility = GONE
+          }
+          else -> {
+            answerView.text = questionnaireViewItem.answerString(answerView.context)
+            answerView.visibility = VISIBLE
+            if (questionnaireViewItem.validationResult is Invalid) {
+              errorView.findViewById<TextView>(R.id.error_text_view).text =
+                questionnaireViewItem.validationResult.getSingleStringValidationMessage()
+              errorView.visibility = VISIBLE
+            } else {
+              errorView.visibility = GONE
             }
-          text = questionnaireViewItem.answerString(context)
+          }
         }
 
         divider.visibility =
           if (header.visibility == VISIBLE ||
               flyOverTextView.visibility == VISIBLE ||
-              answerTextView.visibility == VISIBLE
+              answerView.visibility == VISIBLE ||
+              errorView.visibility == VISIBLE
           ) {
             VISIBLE
           } else {
diff --git a/datacapture/src/main/res/drawable/ic_error_48px.xml b/datacapture/src/main/res/drawable/ic_error_48px.xml
new file mode 100644
index 0000000000..56e092bf4d
--- /dev/null
+++ b/datacapture/src/main/res/drawable/ic_error_48px.xml
@@ -0,0 +1,14 @@
+<vector
+    android:autoMirrored="true"
+    android:height="48dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="48"
+    android:viewportWidth="48"
+    android:width="48dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M24,34Q24.7,34 25.175,33.525Q25.65,33.05 25.65,32.35Q25.65,31.65 25.175,31.175Q24.7,30.7 24,30.7Q23.3,30.7 22.825,31.175Q22.35,31.65 22.35,32.35Q22.35,33.05 22.825,33.525Q23.3,34 24,34ZM22.65,26.35H25.65V13.7H22.65ZM24,44Q19.9,44 16.25,42.425Q12.6,40.85 9.875,38.125Q7.15,35.4 5.575,31.75Q4,28.1 4,23.95Q4,19.85 5.575,16.2Q7.15,12.55 9.875,9.85Q12.6,7.15 16.25,5.575Q19.9,4 24.05,4Q28.15,4 31.8,5.575Q35.45,7.15 38.15,9.85Q40.85,12.55 42.425,16.2Q44,19.85 44,24Q44,28.1 42.425,31.75Q40.85,35.4 38.15,38.125Q35.45,40.85 31.8,42.425Q28.15,44 24,44Z"
+    />
+</vector>
diff --git a/datacapture/src/main/res/layout/review_view.xml b/datacapture/src/main/res/layout/review_view.xml
index 01887d8bde..1a87bdeda5 100644
--- a/datacapture/src/main/res/layout/review_view.xml
+++ b/datacapture/src/main/res/layout/review_view.xml
@@ -22,11 +22,45 @@
     android:layout_marginTop="@dimen/item_margin_vertical"
     android:orientation="vertical"
 >
-    <com.google.android.fhir.datacapture.views.HeaderView
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-    />
+    >
+        <TextView
+            android:id="@+id/prefix"
+            style="?attr/questionnaireReviewModeQuestionTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingEnd="@dimen/prefix_padding_end"
+            app:layout_constraintEnd_toStartOf="@+id/question"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+        />
+        <TextView
+            android:id="@+id/question"
+            style="?attr/questionnaireReviewModeQuestionTextStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/prefix"
+            app:layout_constraintTop_toTopOf="parent"
+        />
+        <TextView
+            android:id="@+id/hint"
+            style="?attr/questionnaireSubtitleTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/instructions_top_margin"
+            android:layout_gravity="center_vertical"
+            tools:text="Sample helper text"
+            app:layout_constraintTop_toBottomOf="@id/question"
+            app:layout_constraintStart_toStartOf="parent"
+        />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
@@ -40,17 +74,41 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
     />
-
     <TextView
         android:id="@+id/answer_text_view"
-        style="?attr/questionnaireAnswerTextStyle"
-        android:layout_width="match_parent"
+        style="?attr/questionnaireReviewModeAnswerTextStyle"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/item_margin_vertical"
     />
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/error_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/item_margin_vertical"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:visibility="gone"
+    >
+        <View
+            android:layout_width="@dimen/error_icon_width"
+            android:layout_height="@dimen/error_icon_height"
+            android:layout_marginEnd="@dimen/error_icon_margin_end"
+            android:background="@drawable/ic_error_48px"
+            android:backgroundTint="?attr/colorError"
+        />
 
+        <TextView
+            android:id="@+id/error_text_view"
+            style="?attr/questionnaireReviewModeNotAnsweredTextStyle"
+            android:textColor="?attr/colorError"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+        />
+    </LinearLayout>
     <com.google.android.material.divider.MaterialDivider
         android:id="@+id/text_divider"
+        style="?attr/questionnaireReviewModeItemDividerStyle"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/item_margin_vertical"
         android:layout_width="match_parent"
diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index d316cb9f06..8c6b70cdc2 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -30,8 +30,18 @@
     <attr name="questionnaireHelpTextStyle" format="reference" />
     <!--   Style for help button -->
     <attr name="questionnaireHelpButtonStyle" format="reference" />
-    <!--   Style for answer text. -->
-    <attr name="questionnaireAnswerTextStyle" format="reference" />
+    <!--   Style for question text in review mode -->
+    <attr name="questionnaireReviewModeQuestionTextStyle" format="reference" />
+
+    <!--   Style for answer text in review mode -->
+    <attr name="questionnaireReviewModeAnswerTextStyle" format="reference" />
+    <!--   Style for not answered text in review mode -->
+    <attr
+        name="questionnaireReviewModeNotAnsweredTextStyle"
+        format="reference"
+    />
+    <!--   Style for item divider in review mode -->
+    <attr name="questionnaireReviewModeItemDividerStyle" format="reference" />
 
     <!--   Style for radio buttons. -->
     <attr name="questionnaireRadioButtonStyle" format="reference" />
diff --git a/datacapture/src/main/res/values/dimens.xml b/datacapture/src/main/res/values/dimens.xml
index 0fb6998796..c70527a3f4 100644
--- a/datacapture/src/main/res/values/dimens.xml
+++ b/datacapture/src/main/res/values/dimens.xml
@@ -40,6 +40,7 @@
     <dimen name="help_header_margin_bottom">4dp</dimen>
     <dimen name="help_margin_bottom">16dp</dimen>
     <dimen name="icon_inset">16dp</dimen>
+    <dimen name="error_icon_margin_end">4dp</dimen>
     <dimen name="choice_button_image">48dp</dimen>
     <dimen name="attachment_error_margin_top">4dp</dimen>
     <dimen name="attachment_preview_base_margin">8dp</dimen>
@@ -55,4 +56,7 @@
     <!--  dimens for padding between text and icon in the radio button  -->
     <dimen name="padding_between_text_and_icon">16dp</dimen>
     <dimen name="padding_after_text">24dp</dimen>
+    <!--  dimens for error icon width and height on review summary page.  -->
+    <dimen name="error_icon_width">20dp</dimen>
+    <dimen name="error_icon_height">20dp</dimen>
 </resources>
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index 44807e830c..993ba9d4f3 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -42,8 +42,11 @@
         </item>
         <item
             name="questionnaireQuestionTextStyle"
-        >@style/TextAppearance.Material3.TitleMedium
-        </item>
+        >@style/TextAppearance.Material3.TitleMedium</item>
+
+      <item
+            name="questionnaireReviewModeQuestionTextStyle"
+        >@style/TextAppearance.Material3.TitleMedium</item>
         <item
             name="questionnaireSubtitleTextStyle"
         >@style/TextAppearance.Material3.BodyMedium
@@ -58,8 +61,14 @@
             @style/Widget.MaterialComponents.Button.TextButton.Icon
         </item>
         <item
-            name="questionnaireAnswerTextStyle"
-        >@style/Questionnaire.AnswerStyle</item>
+            name="questionnaireReviewModeAnswerTextStyle"
+        >@style/Questionnaire.ReviewModeAnswerStyle</item>
+      <item
+            name="questionnaireReviewModeNotAnsweredTextStyle"
+        >@style/Questionnaire.ReviewModeNotAnsweredTextStyle</item>
+      <item
+            name="questionnaireReviewModeItemDividerStyle"
+        >@style/Questionnaire.ReviewModeMaterialDividerStyle</item>
         <item
             name="questionnaireCheckBoxStyle"
         >@style/Questionnaire.CheckBoxStyle
@@ -168,10 +177,24 @@
     </style>
 
     <style
-        name="Questionnaire.AnswerStyle"
+        name="Questionnaire.ReviewModeAnswerStyle"
+        parent="TextAppearance.Material3.BodyMedium"
+    >
+      <item name="android:alpha">0.5</item>
+    </style>
+
+    <style
+        name="Questionnaire.ReviewModeNotAnsweredTextStyle"
         parent="TextAppearance.Material3.BodyMedium"
     >
-        <item name="android:alpha">0.5</item>
+         <item name="android:textColor">?attr/colorError</item>
+    </style>
+
+    <style
+        name="Questionnaire.ReviewModeMaterialDividerStyle"
+        parent="Widget.Material3.MaterialDivider"
+    >
+      <item name="android:alpha">0.5</item>
     </style>
 
     <style
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
index 23d56d18cb..56ee0409ee 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
@@ -19,19 +19,26 @@ package com.google.android.fhir.datacapture.views.factories
 import android.app.Application
 import android.view.View
 import android.widget.FrameLayout
+import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.test.core.app.ApplicationProvider
 import com.google.android.fhir.datacapture.DisplayItemControlType
+import com.google.android.fhir.datacapture.EXTENSION_DISPLAY_CATEGORY_SYSTEM
+import com.google.android.fhir.datacapture.EXTENSION_DISPLAY_CATEGORY_URL
 import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM
 import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
+import com.google.android.fhir.datacapture.INSTRUCTIONS
 import com.google.android.fhir.datacapture.R
-import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.divider.MaterialDivider
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.CodeableConcept
+import org.hl7.fhir.r4.model.Coding
+import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.junit.Test
@@ -291,17 +298,239 @@ class ReviewViewHolderFactoryTest {
   }
 
   @Test
-  fun `hides error textview in the header`() {
+  fun `shows answer text if question is answered`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "parent-question"
+          type = Questionnaire.QuestionnaireItemType.BOOLEAN
+          required = true
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent()
+          .addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value = BooleanType(true)
+            }
+          ),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text)
+      .isEqualTo("Yes")
+  }
+
+  @Test
+  fun `shows default text if question is not answered`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "parent-question"
+          type = Questionnaire.QuestionnaireItemType.BOOLEAN
+          required = true
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Invalid(listOf("Missing answer for required field")),
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.answer_text_view).text)
+      .isEqualTo("Not Answered")
+  }
+
+  @Test
+  fun `shows an error text if required question is not answered`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "parent-question"
+          type = Questionnaire.QuestionnaireItemType.BOOLEAN
+          required = true
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Invalid(listOf("Missing answer for required field")),
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_view).text)
+      .isEqualTo("Missing answer for required field")
+  }
+
+  @Test
+  fun `hides error view if answer is present`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "parent-question"
+          type = Questionnaire.QuestionnaireItemType.BOOLEAN
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent()
+          .addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value = BooleanType(true)
+            }
+          ),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<LinearLayout>(R.id.error_view).visibility)
+      .isEqualTo(View.GONE)
+  }
+
+  @Test
+  fun `shows prefix text`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix).isVisible).isTrue()
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix).text.toString())
+      .isEqualTo("Prefix?")
+  }
+
+  @Test
+  fun `hides prefix text`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "" },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.prefix).isVisible).isFalse()
+  }
+
+  @Test
+  fun `shows question text`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          repeats = true
+          text = "Question?"
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).text.toString())
+      .isEqualTo("Question?")
+  }
+
+  @Test
+  fun `shows instructions`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "subtitle text"
+                extension = listOf(displayCategoryExtensionWithInstructionsCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.hint).isVisible).isTrue()
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.hint).text.toString())
+      .isEqualTo("subtitle text")
+  }
+
+  @Test
+  fun `hides instructions`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.hint).visibility)
+      .isEqualTo(View.GONE)
+  }
+
+  @Test
+  fun `shows headerItem view`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "subtitle text"
+                extension = listOf(displayCategoryExtensionWithInstructionsCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = Valid,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    )
+
+    assertThat(viewHolder.itemView.visibility).isEqualTo(View.VISIBLE)
+  }
+
+  @Test
+  fun `hides headerItem view`() {
     viewHolder.bind(
       QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
+        validationResult = Valid,
         answersChangedCallback = { _, _, _, _ -> },
       )
     )
 
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.error_text_at_header).visibility)
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.question).visibility)
       .isEqualTo(View.GONE)
   }
+
+  private val displayCategoryExtensionWithInstructionsCode =
+    Extension().apply {
+      url = EXTENSION_DISPLAY_CATEGORY_URL
+      setValue(
+        CodeableConcept().apply {
+          coding =
+            listOf(
+              Coding().apply {
+                code = INSTRUCTIONS
+                system = EXTENSION_DISPLAY_CATEGORY_SYSTEM
+              }
+            )
+        }
+      )
+    }
 }