diff --git a/app/src/main/res/layout-land/submitted_answer_item.xml b/app/src/main/res/layout-land/submitted_answer_item.xml
deleted file mode 100644
index c16bd448059..00000000000
--- a/app/src/main/res/layout-land/submitted_answer_item.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <import type="android.view.View" />
-
-    <variable
-      name="submittedAnswer"
-      type="CharSequence" />
-
-    <variable
-      name="submittedListAnswer"
-      type="org.oppia.android.app.model.ListOfSetsOfHtmlStrings" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:id="@+id/submitted_answer_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{@dimen/submitted_answer_exploration_split_view_margin_end}"
-    app:explorationSplitViewMarginStart="@{@dimen/submitted_answer_exploration_split_view_margin_start}"
-    app:explorationSplitViewMarginTop="@{@dimen/submitted_answer_exploration_split_view_margin_top}"
-    app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/submitted_answer_item_exploration_view_margin_end}"
-    app:explorationViewMarginStart="@{@dimen/submitted_answer_item_exploration_view_margin_start}"
-    app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}"
-    app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/submitted_answer_item_question_split_view_margin_end}"
-    app:questionSplitViewMarginStart="@{@dimen/submitted_answer_item_question_split_view_margin_start}"
-    app:questionSplitViewMarginTop="@{@dimen/submitted_answer_question_split_view_margin_top}"
-    app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/submitted_answer_question_view_margin_end}"
-    app:questionViewMarginStart="@{@dimen/submitted_answer_question_view_margin_start}"
-    app:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}">
-
-    <TextView
-      android:id="@+id/submitted_answer_text_view"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:background="@drawable/submitted_answer_background"
-      android:paddingStart="12dp"
-      android:paddingTop="@{viewModel.hasConversationView ? @dimen/submitted_answer_text_conversation_view_padding_top : @dimen/submitted_answer_text_non_conversation_view_padding_top}"
-      android:paddingEnd="12dp"
-      android:paddingBottom="@{viewModel.hasConversationView ? @dimen/submitted_answer_text_conversation_view_padding_bottom : @dimen/submitted_answer_text_non_conversation_view_padding_bottom}"
-      android:text="@{submittedAnswer}"
-      android:textColor="@color/oppiaPrimaryText"
-      android:textSize="16sp"
-      android:visibility="gone"
-      app:layout_constrainedWidth="true"
-      app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer &amp;&amp; !viewModel.hasConversationView ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
-      app:layout_constraintHorizontal_bias="@{viewModel.hasConversationView ? 1 : 0}"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/submitted_answer_recycler_view"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="@drawable/submitted_answer_background"
-      android:paddingStart="8dp"
-      android:paddingEnd="8dp"
-      android:visibility="gone"
-      app:itemDecorator="@{@drawable/divider}"
-      app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:list="@{submittedListAnswer.setOfHtmlStringsList}" />
-
-    <ImageView
-      android:id="@+id/answer_tick"
-      android:layout_width="@dimen/answer_tick_size"
-      android:layout_height="@dimen/answer_tick_size"
-      android:layout_gravity="center_vertical"
-      android:layout_marginStart="@dimen/answer_tick_margin"
-      android:src="@drawable/ic_check_primary"
-      android:visibility="@{viewModel.isCorrectAnswer &amp;&amp; !viewModel.hasConversationView ? View.VISIBLE : View.GONE}"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toEndOf="@+id/submitted_answer_text_view"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.Guideline
-      android:id="@+id/answer_tick_guideline"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      app:layout_constraintGuide_end="@{@dimen/answer_tick_margin + @dimen/answer_tick_size}" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml b/app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml
deleted file mode 100644
index 8dabdeb4b71..00000000000
--- a/app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <import type="android.view.View" />
-
-    <variable
-      name="submittedAnswer"
-      type="CharSequence" />
-
-    <variable
-      name="submittedListAnswer"
-      type="org.oppia.android.app.model.ListOfSetsOfHtmlStrings" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer}"
-    app:explorationSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_start_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_start_no_extra_interaction_answer}"
-    app:explorationSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_top_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer}"
-    app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:explorationSplitViewPaddingBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewPaddingEnd="@{@dimen/space_0dp}"
-    app:explorationSplitViewPaddingStart="@{@dimen/space_0dp}"
-    app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}"
-    app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/submitted_answer_item_exploration_view_margin_end}"
-    app:explorationViewMarginStart="@{@dimen/submitted_answer_exploration_view_margin_start}"
-    app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}"
-    app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:explorationViewPaddingBottom="@{@dimen/space_0dp}"
-    app:explorationViewPaddingEnd="@{@dimen/space_0dp}"
-    app:explorationViewPaddingStart="@{@dimen/space_0dp}"
-    app:explorationViewPaddingTop="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_end_no_extra_interaction_answer}"
-    app:questionSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_start_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_start_no_extra_interaction_answer}"
-    app:questionSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_top_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_top_no_extra_interaction_answer}"
-    app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}"
-    app:questionSplitViewPaddingStart="@{@dimen/space_0dp}"
-    app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
-    app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/submitted_answer_item_question_view_margin_end}"
-    app:questionViewMarginStart="@{@dimen/submitted_answer_item_question_view_margin_start}"
-    app:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}"
-    app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:questionViewPaddingBottom="@{@dimen/space_0dp}"
-    app:questionViewPaddingEnd="@{@dimen/space_0dp}"
-    app:questionViewPaddingStart="@{@dimen/space_0dp}"
-    app:questionViewPaddingTop="@{@dimen/space_0dp}">
-
-    <FrameLayout
-      android:id="@+id/submitted_answer_container"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-          android:id="@+id/submitted_answer_text_view"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:background="@drawable/submitted_answer_background"
-          android:paddingStart="12dp"
-          android:paddingTop="8dp"
-          android:paddingEnd="12dp"
-          android:paddingBottom="8dp"
-          android:text="@{submittedAnswer}"
-          android:textColor="@color/oppiaPrimaryText"
-          android:textSize="16sp"
-          android:visibility="gone"
-          app:layout_constrainedWidth="true"
-          app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer &amp;&amp; !viewModel.hasConversationView ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
-          app:layout_constraintHorizontal_bias="@{viewModel.hasConversationView ? 1 : 0}"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-          android:id="@+id/submitted_answer_recycler_view"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:background="@drawable/submitted_answer_background"
-          android:paddingStart="8dp"
-          android:paddingEnd="8dp"
-          android:visibility="gone"
-          app:itemDecorator="@{@drawable/divider}"
-          app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent"
-          app:list="@{submittedListAnswer.setOfHtmlStringsList}" />
-
-        <ImageView
-          android:id="@+id/answer_tick"
-          android:layout_width="@dimen/answer_tick_size"
-          android:layout_height="@dimen/answer_tick_size"
-          android:layout_gravity="center_vertical"
-          android:layout_marginStart="@dimen/answer_tick_margin"
-          android:src="@drawable/ic_check_primary"
-          android:visibility="@{viewModel.isCorrectAnswer &amp;&amp; !viewModel.hasConversationView ? View.VISIBLE : View.GONE}"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toEndOf="@+id/submitted_answer_text_view"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Guideline
-          android:id="@+id/answer_tick_guideline"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:orientation="vertical"
-          app:layout_constraintGuide_end="@{@dimen/answer_tick_margin + @dimen/answer_tick_size}" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml b/app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml
deleted file mode 100644
index b0f179dbcb7..00000000000
--- a/app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <import type="android.view.View" />
-
-    <variable
-      name="submittedAnswer"
-      type="CharSequence" />
-
-    <variable
-      name="submittedListAnswer"
-      type="org.oppia.android.app.model.ListOfSetsOfHtmlStrings" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer}"
-    app:explorationSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_start_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_start_no_extra_interaction_answer}"
-    app:explorationSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_top_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer}"
-    app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:explorationSplitViewPaddingBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewPaddingEnd="@{@dimen/space_0dp}"
-    app:explorationSplitViewPaddingStart="@{@dimen/space_0dp}"
-    app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}"
-    app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/submitted_answer_item_exploration_view_margin_end}"
-    app:explorationViewMarginStart="@{@dimen/submitted_answer_item_exploration_view_margin_start}"
-    app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}"
-    app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:explorationViewPaddingBottom="@{@dimen/space_0dp}"
-    app:explorationViewPaddingEnd="@{@dimen/space_0dp}"
-    app:explorationViewPaddingStart="@{@dimen/space_0dp}"
-    app:explorationViewPaddingTop="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_end_no_extra_interaction_answer}"
-    app:questionSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_start_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_start_no_extra_interaction_answer}"
-    app:questionSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_top_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_top_no_extra_interaction_answer}"
-    app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
-    app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}"
-    app:questionSplitViewPaddingStart="@{@dimen/space_0dp}"
-    app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
-    app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/submitted_answer_item_question_view_margin_end}"
-    app:questionViewMarginStart="@{@dimen/submitted_answer_item_question_view_margin_start}"
-    app:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}"
-    app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
-    app:questionViewPaddingBottom="@{@dimen/space_0dp}"
-    app:questionViewPaddingEnd="@{@dimen/space_0dp}"
-    app:questionViewPaddingStart="@{@dimen/space_0dp}"
-    app:questionViewPaddingTop="@{@dimen/space_0dp}">
-
-    <FrameLayout
-      android:id="@+id/submitted_answer_container"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-          android:id="@+id/submitted_answer_text_view"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:background="@drawable/submitted_answer_background"
-          android:paddingStart="12dp"
-          android:paddingTop="8dp"
-          android:paddingEnd="12dp"
-          android:paddingBottom="8dp"
-          android:text="@{submittedAnswer}"
-          android:textColor="@color/oppiaPrimaryText"
-          android:textSize="16sp"
-          android:visibility="gone"
-          app:layout_constrainedWidth="true"
-          app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer &amp;&amp; !viewModel.hasConversationView ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
-          app:layout_constraintHorizontal_bias="@{viewModel.hasConversationView ? 1 : 0}"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-          android:id="@+id/submitted_answer_recycler_view"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:background="@drawable/submitted_answer_background"
-          android:paddingStart="8dp"
-          android:paddingEnd="8dp"
-          android:visibility="gone"
-          app:itemDecorator="@{@drawable/divider}"
-          app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent"
-          app:list="@{submittedListAnswer.setOfHtmlStringsList}" />
-
-        <ImageView
-          android:id="@+id/answer_tick"
-          android:layout_width="@dimen/answer_tick_size"
-          android:layout_height="@dimen/answer_tick_size"
-          android:layout_gravity="center_vertical"
-          android:layout_marginStart="@dimen/answer_tick_margin"
-          android:src="@drawable/ic_check_primary"
-          android:visibility="@{viewModel.isCorrectAnswer &amp;&amp; !viewModel.hasConversationView ? View.VISIBLE : View.GONE}"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toEndOf="@+id/submitted_answer_text_view"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Guideline
-          android:id="@+id/answer_tick_guideline"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:orientation="vertical"
-          app:layout_constraintGuide_end="@{@dimen/answer_tick_margin + @dimen/answer_tick_size}" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/submitted_answer_item.xml b/app/src/main/res/layout/submitted_answer_item.xml
index f68f8c198ae..2c8b554d7f9 100644
--- a/app/src/main/res/layout/submitted_answer_item.xml
+++ b/app/src/main/res/layout/submitted_answer_item.xml
@@ -31,24 +31,24 @@
     android:layout_height="wrap_content"
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{@dimen/submitted_answer_exploration_split_view_margin_end}"
-    app:explorationSplitViewMarginStart="@{@dimen/submitted_answer_exploration_split_view_margin_start}"
-    app:explorationSplitViewMarginTop="@{@dimen/submitted_answer_exploration_split_view_margin_top}"
+    app:explorationSplitViewMarginEnd="@{@dimen/submitted_answer_item_exploration_split_view_margin_end}"
+    app:explorationSplitViewMarginStart="@{@dimen/submitted_answer_item_exploration_split_view_margin_start}"
+    app:explorationSplitViewMarginTop="@{@dimen/submitted_answer_item_exploration_split_view_margin_top}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/submitted_answer_exploration_view_margin_end}"
-    app:explorationViewMarginStart="@{@dimen/submitted_answer_exploration_view_margin_start}"
-    app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}"
+    app:explorationViewMarginEnd="@{@dimen/submitted_answer_item_exploration_view_margin_end}"
+    app:explorationViewMarginStart="@{@dimen/submitted_answer_item_exploration_view_margin_start}"
+    app:explorationViewMarginTop="@{@dimen/submitted_answer_item_exploration_view_margin_top}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:questionSplitViewMarginEnd="@{@dimen/submitted_answer_item_question_split_view_margin_end}"
     app:questionSplitViewMarginStart="@{@dimen/submitted_answer_item_question_split_view_margin_start}"
-    app:questionSplitViewMarginTop="@{@dimen/submitted_answer_question_split_view_margin_top}"
+    app:questionSplitViewMarginTop="@{@dimen/submitted_answer_item_question_split_view_margin_top}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
     app:questionViewMarginEnd="@{@dimen/submitted_answer_item_question_view_margin_end}"
     app:questionViewMarginStart="@{@dimen/submitted_answer_item_question_view_margin_start}"
-    app:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}">
+    app:questionViewMarginTop="@{@dimen/submitted_answer_item_question_view_margin_top}">
 
     <TextView
       android:id="@+id/submitted_answer_text_view"
@@ -56,10 +56,7 @@
       android:layout_height="wrap_content"
       android:background="@drawable/submitted_answer_background"
       android:contentDescription="@{accessibleAnswer ?? submittedAnswer}"
-      android:paddingStart="12dp"
-      android:paddingTop="@{viewModel.hasConversationView ? @dimen/submitted_answer_text_conversation_view_padding_top : @dimen/submitted_answer_text_non_conversation_view_padding_top}"
-      android:paddingEnd="12dp"
-      android:paddingBottom="@{viewModel.hasConversationView ? @dimen/submitted_answer_text_conversation_view_padding_bottom : @dimen/submitted_answer_text_non_conversation_view_padding_bottom}"
+      android:padding="12dp"
       android:text="@{submittedAnswer}"
       android:textColor="@color/oppiaPrimaryText"
       android:textSize="16sp"
diff --git a/app/src/main/res/layout/submitted_html_answer_item.xml b/app/src/main/res/layout/submitted_html_answer_item.xml
index 5711529ea53..9a39c18f085 100644
--- a/app/src/main/res/layout/submitted_html_answer_item.xml
+++ b/app/src/main/res/layout/submitted_html_answer_item.xml
@@ -14,6 +14,8 @@
     android:fontFamily="sans-serif"
     android:gravity="center_vertical"
     android:paddingTop="8dp"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp"
     android:paddingBottom="8dp"
     android:text="@{htmlContent}"
     android:textColor="@color/oppiaPrimaryText"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 7dc1ec8dda7..60caa9ee989 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -10,8 +10,6 @@
   <dimen name="drag_drop_item_exploration_split_view_margin_end">32dp</dimen>
   <dimen name="drag_drop_item_question_split_view_margin_end">32dp</dimen>
   <dimen name="drag_drop_item_question_split_view_margin_start">32dp</dimen>
-  <dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
-  <dimen name="submitted_answer_item_question_split_view_margin_start">32dp</dimen>
 
   <dimen name="state_fragment_split_view_margin_end">64dp</dimen>
   <dimen name="state_fragment_split_view_margin_start">64dp</dimen>
@@ -129,6 +127,26 @@
   <dimen name="selection_interaction_item_padding_start">16dp</dimen>
   <dimen name="selection_interaction_item_padding_end">16dp</dimen>
 
+  <!-- Submitted Answer Item: Exploration Split View -->
+  <dimen name="submitted_answer_item_exploration_split_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_end">24dp</dimen>
+
+  <!-- Submitted Answer Item: Exploration View -->
+  <dimen name="submitted_answer_item_exploration_view_margin_start">80dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_end">48dp</dimen>
+
+  <!-- Submitted Answer Item: Question Split View -->
+  <dimen name="submitted_answer_item_question_split_view_margin_start">32dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
+
+  <!-- Submitted Answer Item: Question View -->
+  <dimen name="submitted_answer_item_question_view_margin_start">64dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_end">64dp</dimen>
+
   <!-- Previous Responses Item: Exploration Split View -->
   <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index a372463679b..a82a5f4bd54 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -54,8 +54,6 @@
   <dimen name="drag_drop_item_question_view_margin_start">192dp</dimen>
   <dimen name="state_fragment_non_split_view_margin_end">192dp</dimen>
   <dimen name="state_fragment_non_split_view_margin_start">192dp</dimen>
-  <dimen name="submitted_answer_item_question_view_margin_end">192dp</dimen>
-  <dimen name="submitted_answer_item_question_view_margin_start">192dp</dimen>
 
   <dimen name="continue_interaction_item_exploration_view_margin_end">176dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_margin_start">176dp</dimen>
@@ -63,7 +61,6 @@
   <dimen name="continue_navigation_item_exploration_view_margin_start">176dp</dimen>
   <dimen name="drag_drop_item_exploration_view_margin_end">176dp</dimen>
   <dimen name="numeric_input_interaction_item_conversation_view_margin_end">176dp</dimen>
-  <dimen name="submitted_answer_item_exploration_view_margin_end">176dp</dimen>
   <dimen name="text_input_interaction_item_conversation_view_margin_end">176dp</dimen>
 
   <dimen name="drag_drop_item_exploration_split_view_margin_top">40dp</dimen>
@@ -150,6 +147,26 @@
   <dimen name="selection_interaction_item_padding_start">24dp</dimen>
   <dimen name="selection_interaction_item_padding_end">24dp</dimen>
 
+  <!-- Submitted Answer Item: Exploration Split View -->
+  <dimen name="submitted_answer_item_exploration_split_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_end">24dp</dimen>
+
+  <!-- Submitted Answer Item: Exploration View -->
+  <dimen name="submitted_answer_item_exploration_view_margin_start">208dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_end">176dp</dimen>
+
+  <!-- Submitted Answer Item: Question Split View -->
+  <dimen name="submitted_answer_item_question_split_view_margin_start">32dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
+
+  <!-- Submitted Answer Item: Question View -->
+  <dimen name="submitted_answer_item_question_view_margin_start">192dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_end">192dp</dimen>
+
   <!-- Previous Responses Item: Exploration Split View -->
   <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index c73c0c44e13..eeaf1c29bd0 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -22,8 +22,6 @@
   <dimen name="drag_drop_item_question_view_margin_start">128dp</dimen>
   <dimen name="state_fragment_non_split_view_margin_end">128dp</dimen>
   <dimen name="state_fragment_non_split_view_margin_start">128dp</dimen>
-  <dimen name="submitted_answer_item_question_view_margin_end">128dp</dimen>
-  <dimen name="submitted_answer_item_question_view_margin_start">128dp</dimen>
 
   <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen>
@@ -57,7 +55,6 @@
 
   <dimen name="drag_drop_item_exploration_view_margin_start">144dp</dimen>
   <dimen name="numeric_input_interaction_item_conversation_view_margin_start">144dp</dimen>
-  <dimen name="submitted_answer_item_exploration_view_margin_start">144dp</dimen>
   <dimen name="text_input_interaction_item_conversation_view_margin_start">144dp</dimen>
   <dimen name="profile_chooser_fragment_margin_top_profile_not_added">124dp</dimen>
 
@@ -67,7 +64,6 @@
   <dimen name="continue_navigation_item_exploration_view_margin_start">112dp</dimen>
   <dimen name="drag_drop_item_exploration_view_margin_end">112dp</dimen>
   <dimen name="numeric_input_interaction_item_conversation_view_margin_end">112dp</dimen>
-  <dimen name="submitted_answer_item_exploration_view_margin_end">112dp</dimen>
   <dimen name="text_input_interaction_item_conversation_view_margin_end">112dp</dimen>
   <dimen name="profile_chooser_margin_top_profile_not_added">84dp</dimen>
 
@@ -154,6 +150,26 @@
   <dimen name="selection_interaction_item_padding_start">24dp</dimen>
   <dimen name="selection_interaction_item_padding_end">24dp</dimen>
 
+  <!-- Submitted Answer Item: Exploration Split View -->
+  <dimen name="submitted_answer_item_exploration_split_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_end">24dp</dimen>
+
+  <!-- Submitted Answer Item: Exploration View -->
+  <dimen name="submitted_answer_item_exploration_view_margin_start">144dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_end">112dp</dimen>
+
+  <!-- Submitted Answer Item: Question Split View -->
+  <dimen name="submitted_answer_item_question_split_view_margin_start">32dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
+
+  <!-- Submitted Answer Item: Question View -->
+  <dimen name="submitted_answer_item_question_view_margin_start">128dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_end">128dp</dimen>
+
   <!-- Previous Responses Item: Exploration Split View -->
   <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f33a0015b4c..e319cca6ab0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -190,7 +190,6 @@
   <dimen name="profile_chooser_margin_end_profile_already_added">72dp</dimen>
 
   <dimen name="drag_drop_interaction_item_exploration_view_margin_start">80dp</dimen>
-  <dimen name="submitted_answer_item_exploration_view_margin_start">80dp</dimen>
   <dimen name="text_input_interaction_item_margin_start">80dp</dimen>
 
   <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
@@ -201,12 +200,7 @@
   <dimen name="drag_drop_item_question_view_margin_start">32dp</dimen>
   <dimen name="state_fragment_split_view_margin_start">32dp</dimen>
   <dimen name="state_fragment_split_view_margin_end">32dp</dimen>
-  <dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
-  <dimen name="submitted_answer_item_question_split_view_margin_start">32dp</dimen>
-  <dimen name="submitted_answer_item_question_view_margin_end">32dp</dimen>
-  <dimen name="submitted_answer_item_question_view_margin_start">32dp</dimen>
 
-  <dimen name="submitted_answer_item_exploration_view_margin_end">48dp</dimen>
   <dimen name="profile_chooser_add_view_circular_image_margin_top_profile_already_added">48dp</dimen>
   <dimen name="profile_chooser_profile_view_circular_image_margin_top_profile_already_added">48dp</dimen>
   <dimen name="state_fragment_padding_top_audio_bar_visible">48dp</dimen>
@@ -287,6 +281,26 @@
   <dimen name="selection_interaction_item_padding_start">16dp</dimen>
   <dimen name="selection_interaction_item_padding_end">16dp</dimen>
 
+  <!-- Submitted Answer Item: Exploration Split View -->
+  <dimen name="submitted_answer_item_exploration_split_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_split_view_margin_end">24dp</dimen>
+
+  <!-- Submitted Answer Item: Exploration View -->
+  <dimen name="submitted_answer_item_exploration_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_end">24dp</dimen>
+
+  <!-- Submitted Answer Item: Question Split View -->
+  <dimen name="submitted_answer_item_question_split_view_margin_start">32dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
+
+  <!-- Submitted Answer Item: Question View -->
+  <dimen name="submitted_answer_item_question_view_margin_start">32dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_end">32dp</dimen>
+
   <!-- Previous Responses Item: Exploration Split View -->
   <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen>