diff --git a/app/src/main/res/layout-land/option_audio_language.xml b/app/src/main/res/layout-land/option_audio_language.xml
deleted file mode 100644
index 9910b0882b7..00000000000
--- a/app/src/main/res/layout-land/option_audio_language.xml
+++ /dev/null
@@ -1,51 +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>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.options.OptionsAudioLanguageViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:id="@+id/audio_laguage_item_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/general_item_background_border"
-    android:minHeight="48dp"
-    android:onClick="@{(v) -> viewModel.onAudioLanguageClicked()}"
-    android:paddingStart="36dp"
-    android:paddingTop="20dp"
-    android:paddingEnd="36dp"
-    android:paddingBottom="20dp">
-
-    <TextView
-      android:id="@+id/audio_language_label_text_view"
-      style="@style/TextViewStart"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:fontFamily="sans-serif"
-      android:text="@string/audio_language"
-      android:textColor="@color/oppia_primary_text_dark"
-      android:textSize="16sp"
-      app:layout_constraintBottom_toTopOf="@id/audio_language_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/audio_language_text_view"
-      style="@style/TextViewStart"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:fontFamily="sans-serif"
-      android:text="@{viewModel.audioLanguage}"
-      android:textColor="@color/black_54"
-      android:textSize="14sp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/audio_language_label_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp/option_audio_language.xml b/app/src/main/res/layout-sw600dp/option_audio_language.xml
deleted file mode 100644
index 7f513ed9620..00000000000
--- a/app/src/main/res/layout-sw600dp/option_audio_language.xml
+++ /dev/null
@@ -1,55 +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>
-
-    <variable
-      name="commonViewModel"
-      type="org.oppia.android.app.options.OptionControlsViewModel" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.options.OptionsAudioLanguageViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:id="@+id/audio_laguage_item_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@{commonViewModel.selectedFragmentIndex == viewModel.itemIndex ? @drawable/general_item_background_border_cyan : @drawable/general_item_background_border}"
-    android:minHeight="48dp"
-    android:onClick="@{(v) -> viewModel.onAudioLanguageClicked()}"
-    android:paddingStart="16dp"
-    android:paddingTop="20dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="20dp">
-
-    <TextView
-      android:id="@+id/audio_language_label_text_view"
-      style="@style/TextViewStart"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:fontFamily="sans-serif"
-      android:text="@string/audio_language"
-      android:textColor="@color/oppia_primary_text_dark"
-      android:textSize="16sp"
-      app:layout_constraintBottom_toTopOf="@id/audio_language_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/audio_language_text_view"
-      style="@style/TextViewStart"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:fontFamily="sans-serif"
-      android:text="@{viewModel.audioLanguage}"
-      android:textColor="@color/black_54"
-      android:textSize="14sp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/audio_language_label_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/option_audio_language.xml b/app/src/main/res/layout/option_audio_language.xml
index 10c1dea1f5d..2e6a6f05554 100644
--- a/app/src/main/res/layout/option_audio_language.xml
+++ b/app/src/main/res/layout/option_audio_language.xml
@@ -3,6 +3,9 @@
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <data>
+    <variable
+      name="commonViewModel"
+      type="org.oppia.android.app.options.OptionControlsViewModel" />
 
     <variable
       name="viewModel"
@@ -13,12 +16,12 @@
     android:id="@+id/audio_laguage_item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/general_item_background_border"
+    android:background="@{commonViewModel.selectedFragmentIndex == viewModel.itemIndex ? @drawable/general_item_background_border_cyan : @drawable/general_item_background_border}"
     android:minHeight="48dp"
     android:onClick="@{(v) -> viewModel.onAudioLanguageClicked()}"
-    android:paddingStart="16dp"
+    android:paddingStart="@dimen/option_audio_language_padding_start"
     android:paddingTop="20dp"
-    android:paddingEnd="16dp"
+    android:paddingEnd="@dimen/option_audio_language_padding_end"
     android:paddingBottom="20dp">
 
     <TextView
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 4c7917e56b7..1211b45ba8d 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -447,4 +447,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">36dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">36dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">0dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">36dp</dimen>
+  <dimen name="option_audio_language_padding_end">36dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index ad7e91af790..37796efa8b0 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -439,4 +439,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index 44fed5c06ab..25578437877 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -438,4 +438,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bdde9e15052..379a41ea0c3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -648,4 +648,8 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>