diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml
index 803536416aa..c8571f1706f 100644
--- a/app/src/main/res/layout/content_item.xml
+++ b/app/src/main/res/layout/content_item.xml
@@ -43,12 +43,13 @@
       android:id="@+id/content_text_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:minWidth="48dp"
-      android:minHeight="48dp"
       android:breakStrategy="simple"
       android:fontFamily="sans-serif"
+      android:minWidth="48dp"
+      android:minHeight="48dp"
       android:text="@{htmlContent}"
       android:textColor="@color/component_color_shared_primary_text_color"
+      android:textColorLink="@color/component_color_shared_link_text_color"
       android:textSize="16sp"
       android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
       app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}"
diff --git a/app/src/main/res/layout/feedback_item.xml b/app/src/main/res/layout/feedback_item.xml
index 9c44c55e7b0..f87b4d316b0 100644
--- a/app/src/main/res/layout/feedback_item.xml
+++ b/app/src/main/res/layout/feedback_item.xml
@@ -43,12 +43,13 @@
       android:id="@+id/feedback_text_view"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:minHeight="48dp"
-      android:minWidth="48dp"
       android:breakStrategy="simple"
       android:fontFamily="sans-serif"
+      android:minWidth="48dp"
+      android:minHeight="48dp"
       android:text="@{htmlContent}"
-      android:textColor="@color/component_color_shared_feedback_item_text_view_color"
+      android:textColor="@color/component_color_shared_primary_text_color"
+      android:textColorLink="@color/component_color_shared_link_text_color"
       android:textSize="16sp"
       android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
       app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}"
diff --git a/app/src/main/res/layout/submitted_answer_item.xml b/app/src/main/res/layout/submitted_answer_item.xml
index 48524cf665e..eea505bac12 100644
--- a/app/src/main/res/layout/submitted_answer_item.xml
+++ b/app/src/main/res/layout/submitted_answer_item.xml
@@ -50,7 +50,8 @@
       android:contentDescription="@{viewModel.submittedAnswerContentDescription}"
       android:padding="12dp"
       android:text="@{viewModel.submittedAnswer}"
-      android:textColor="@color/component_color_shared_submitted_answer_item_text_color"
+      android:textColor="@color/component_color_shared_primary_text_color"
+      android:textColorLink="@color/component_color_shared_link_text_color"
       android:textSize="16sp"
       android:visibility="gone"
       app:layout_constrainedWidth="true"
@@ -88,11 +89,12 @@
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/answer_tick_margin"
       android:importantForAccessibility="no"
-      app:srcCompat="@drawable/ic_check_primary"
       android:visibility="@{viewModel.isCorrectAnswer && !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" />
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/ic_check_primary"
+      app:tint="@color/component_color_shared_check_icon_color" />
 
     <androidx.constraintlayout.widget.Guideline
       android:id="@+id/answer_tick_guideline"
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 bcad5074fc2..e3a800a66b5 100644
--- a/app/src/main/res/layout/submitted_html_answer_item.xml
+++ b/app/src/main/res/layout/submitted_html_answer_item.xml
@@ -13,11 +13,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:fontFamily="sans-serif"
-    android:paddingTop="8dp"
     android:paddingStart="4dp"
+    android:paddingTop="8dp"
     android:paddingEnd="4dp"
     android:paddingBottom="8dp"
     android:text="@{htmlContent}"
-    android:textColor="@color/component_color_shared_oppia_submitted_answer_text_color"
+    android:textColor="@color/component_color_shared_primary_text_color"
+    android:textColorLink="@color/component_color_shared_link_text_color"
     android:textSize="16sp" />
 </layout>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index b1fa82faff1..7ed15067566 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -13,7 +13,6 @@
   <color name="component_color_shared_revision_card_background_color">@color/color_palette_primary_background_color</color>
   <color name="component_color_shared_topic_card_item_background_color">@color/color_palette_topic_card_item_background_color</color>
   <color name="component_color_shared_content_item_text_view_color">@color/color_palette_highlighted_text_color</color>
-  <color name="component_color_shared_feedback_item_text_view_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_topic_card_text_view_color">@color/color_palette_topic_card_text_color</color>
   <color name="component_color_shared_story_card_topic_name_text_color">@color/color_palette_card_topic_name_text_color</color>
   <color name="component_color_shared_story_card_background_color">@color/color_palette_primary_background_color</color>
@@ -27,7 +26,6 @@
   <color name="component_color_shared_input_error_color">@color/color_palette_input_error_color</color>
   <color name="component_color_shared_submitted_answer_item_solid_color">@color/color_palette_submitted_answer_item_solid_color</color>
   <color name="component_color_shared_submitted_answer_item_stroke_color">@color/color_palette_submitted_answer_item_stroke_color</color>
-  <color name="component_color_shared_submitted_answer_item_text_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_edit_text_hint_color">@color/color_palette_hint_text_input_interaction_color</color>
   <color name="component_color_shared_input_interaction_edit_text_border_color">@color/color_palette_input_interaction_edit_text_border_color</color>
   <color name="component_color_shared_input_interaction_edit_text_not_selected_border_color">@color/color_palette_input_interaction_edit_text_not_selected_border_color</color>
@@ -35,7 +33,6 @@
   <color name="component_color_shared_arrow_right_grey_color">@color/color_palette_arrow_right_grey_color</color>
   <color name="component_color_shared_rounded_rect_background_color">@color/color_palette_rounded_rect_background_color</color>
   <color name="component_color_shared_drag_drop_background_color">@color/color_palette_drag_drop_background_color</color>
-  <color name="component_color_shared_oppia_submitted_answer_text_color">@color/color_palette_oppia_submitted_answer_text_color</color>
   <color name="component_color_shared_drag_drop_single_item_stroke_color">@color/color_palette_drag_drop_single_item_stroke_color</color>
   <color name="component_color_shared_drag_drop_single_item_gradient_start_color">@color/color_palette_drag_drop_single_item_gradient_start_color</color>
   <color name="component_color_shared_drag_drop_single_item_gradient_center_color">@color/color_palette_drag_drop_single_item_gradient_center_color</color>