diff --git a/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml b/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml
index 43e9dddbb6d..e37111661f0 100644
--- a/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml
+++ b/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml
@@ -19,7 +19,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/faq_single_activity_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_faq_single_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
index 9019b5e525b..fd27c963ea8 100644
--- a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
@@ -14,8 +14,8 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:baselineAligned="false">
+    android:baselineAligned="false"
+    android:orientation="horizontal">
 
     <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="0dp"
@@ -47,8 +47,8 @@
     <ScrollView
       android:layout_width="0dp"
       android:layout_height="match_parent"
-      android:background="@color/component_color_resume_lesson_activity_background_color"
-      android:layout_weight="1">
+      android:layout_weight="1"
+      android:background="@color/component_color_resume_lesson_activity_background_color">
 
       <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -117,6 +117,5 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
       </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-
   </LinearLayout>
 </layout>
diff --git a/app/src/main/res/layout-sw600dp/help_activity.xml b/app/src/main/res/layout-sw600dp/help_activity.xml
index 6608535b50e..f39a382d510 100644
--- a/app/src/main/res/layout-sw600dp/help_activity.xml
+++ b/app/src/main/res/layout-sw600dp/help_activity.xml
@@ -43,10 +43,10 @@
         android:background="@color/component_color_help_activity_background_color"
         android:contentDescription="@string/help_activity_back_arrow_description"
         android:padding="12dp"
-        app:srcCompat="@drawable/ic_arrow_back_black_24_dp"
         android:visibility="gone"
         app:layout_constraintStart_toEndOf="@id/multipane_guideline"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_arrow_back_black_24_dp" />
 
       <TextView
         android:id="@+id/help_multipane_options_title_textview"
@@ -101,9 +101,10 @@
   <fragment
     android:id="@+id/help_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
+    android:minWidth="@dimen/navigation_drawer_width"
     app:layout="@layout/drawer_fragment"
     tools:layout="@layout/drawer_fragment" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout-sw600dp/option_activity.xml b/app/src/main/res/layout-sw600dp/option_activity.xml
index 767faf4a5dc..abb585e8a4c 100644
--- a/app/src/main/res/layout-sw600dp/option_activity.xml
+++ b/app/src/main/res/layout-sw600dp/option_activity.xml
@@ -87,9 +87,10 @@
   <fragment
     android:id="@+id/options_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
+    android:minWidth="@dimen/navigation_drawer_width"
     app:layout="@layout/drawer_fragment"
     tools:layout="@layout/drawer_fragment" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout-sw600dp/story_fragment.xml b/app/src/main/res/layout-sw600dp/story_fragment.xml
index 2480192d109..66fb3c73a8c 100644
--- a/app/src/main/res/layout-sw600dp/story_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/story_fragment.xml
@@ -28,7 +28,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/story_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_story_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml
index 58d219619ca..0ff58ad52e9 100644
--- a/app/src/main/res/layout/admin_auth_activity.xml
+++ b/app/src/main/res/layout/admin_auth_activity.xml
@@ -27,7 +27,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/admin_auth_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_admin_auth_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/administrator_controls_activity.xml b/app/src/main/res/layout/administrator_controls_activity.xml
index c3203dff8be..a7de349b277 100644
--- a/app/src/main/res/layout/administrator_controls_activity.xml
+++ b/app/src/main/res/layout/administrator_controls_activity.xml
@@ -31,9 +31,10 @@
     <fragment
       android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
       android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-      android:layout_width="@dimen/navigation_drawer_width"
+      android:layout_width="wrap_content"
       android:layout_height="match_parent"
       android:layout_gravity="start"
+      android:minWidth="@dimen/navigation_drawer_width"
       app:layout="@layout/drawer_fragment"
       tools:layout="@layout/drawer_fragment" />
   </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/app_language_activity.xml b/app/src/main/res/layout/app_language_activity.xml
index b4e0066560b..6667ff04848 100644
--- a/app/src/main/res/layout/app_language_activity.xml
+++ b/app/src/main/res/layout/app_language_activity.xml
@@ -18,7 +18,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/app_language_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/app_version_activity.xml b/app/src/main/res/layout/app_version_activity.xml
index c5c00c9a649..669c4e7689e 100644
--- a/app/src/main/res/layout/app_version_activity.xml
+++ b/app/src/main/res/layout/app_version_activity.xml
@@ -18,8 +18,9 @@
     <androidx.appcompat.widget.Toolbar
       android:id="@+id/app_version_toolbar"
       android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
+      android:layout_height="wrap_content"
       android:background="@color/component_color_app_version_activity_toolbar_color"
+      android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
       app:navigationContentDescription="@string/navigate_up"
       app:navigationIcon="?attr/homeAsUpIndicator"
@@ -35,8 +36,8 @@
     android:layout_height="4dp"
     android:layout_gravity="top"
     android:background="@drawable/toolbar_drop_shadow"
-    app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@id/app_version_app_bar_layout" />
 
   <FrameLayout
diff --git a/app/src/main/res/layout/audio_language_activity.xml b/app/src/main/res/layout/audio_language_activity.xml
index 2f49a81c404..2affd49a64d 100644
--- a/app/src/main/res/layout/audio_language_activity.xml
+++ b/app/src/main/res/layout/audio_language_activity.xml
@@ -18,7 +18,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/audio_language_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/completed_story_list_fragment.xml b/app/src/main/res/layout/completed_story_list_fragment.xml
index 54e5003da41..141cfbb9a54 100644
--- a/app/src/main/res/layout/completed_story_list_fragment.xml
+++ b/app/src/main/res/layout/completed_story_list_fragment.xml
@@ -26,7 +26,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/completed_story_list_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_completed_progress_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/developer_options_activity.xml b/app/src/main/res/layout/developer_options_activity.xml
index 827a7ab19ca..c1638ad4af3 100644
--- a/app/src/main/res/layout/developer_options_activity.xml
+++ b/app/src/main/res/layout/developer_options_activity.xml
@@ -42,9 +42,10 @@
     <fragment
       android:id="@+id/developer_options_activity_fragment_navigation_drawer"
       android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-      android:layout_width="@dimen/navigation_drawer_width"
+      android:layout_width="wrap_content"
       android:layout_height="match_parent"
       android:layout_gravity="start"
+      android:minWidth="@dimen/navigation_drawer_width"
       app:layout="@layout/drawer_fragment"
       tools:layout="@layout/drawer_fragment" />
   </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/exploration_activity.xml b/app/src/main/res/layout/exploration_activity.xml
index e8f070619a3..5da95d484d3 100755
--- a/app/src/main/res/layout/exploration_activity.xml
+++ b/app/src/main/res/layout/exploration_activity.xml
@@ -27,7 +27,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/exploration_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_exploration_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
@@ -73,7 +73,6 @@
             android:minWidth="48dp"
             android:minHeight="48dp"
             android:scaleType="center" />
-
         </LinearLayout>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/faq_single_activity.xml b/app/src/main/res/layout/faq_single_activity.xml
index 76371a3dc8a..22bf7a86930 100644
--- a/app/src/main/res/layout/faq_single_activity.xml
+++ b/app/src/main/res/layout/faq_single_activity.xml
@@ -19,7 +19,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/faq_single_activity_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_faq_single_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/force_network_type_fragment.xml b/app/src/main/res/layout/force_network_type_fragment.xml
index 5247491418a..d5977aa1dfa 100644
--- a/app/src/main/res/layout/force_network_type_fragment.xml
+++ b/app/src/main/res/layout/force_network_type_fragment.xml
@@ -27,8 +27,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/force_network_type_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/help_activity.xml b/app/src/main/res/layout/help_activity.xml
index 152a5b10a7c..ce2e5d4899a 100644
--- a/app/src/main/res/layout/help_activity.xml
+++ b/app/src/main/res/layout/help_activity.xml
@@ -41,9 +41,10 @@
   <fragment
     android:id="@+id/help_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
+    android:minWidth="@dimen/navigation_drawer_width"
     app:layout="@layout/drawer_fragment"
     tools:layout="@layout/drawer_fragment" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/hints_and_solution_fragment.xml b/app/src/main/res/layout/hints_and_solution_fragment.xml
index 5226f9e0d13..161860f39a6 100644
--- a/app/src/main/res/layout/hints_and_solution_fragment.xml
+++ b/app/src/main/res/layout/hints_and_solution_fragment.xml
@@ -27,7 +27,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/hints_and_solution_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/color_def_oppia_dark_blue"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/home_activity.xml b/app/src/main/res/layout/home_activity.xml
index 391b2895c56..97dadff3d6b 100644
--- a/app/src/main/res/layout/home_activity.xml
+++ b/app/src/main/res/layout/home_activity.xml
@@ -31,9 +31,10 @@
   <fragment
     android:id="@+id/home_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
+    android:minWidth="@dimen/navigation_drawer_width"
     app:layout="@layout/drawer_fragment"
     tools:layout="@layout/drawer_fragment" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/license_text_viewer_activity.xml b/app/src/main/res/layout/license_text_viewer_activity.xml
index 3c52db29068..868662524de 100644
--- a/app/src/main/res/layout/license_text_viewer_activity.xml
+++ b/app/src/main/res/layout/license_text_viewer_activity.xml
@@ -16,7 +16,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/license_text_viewer_activity_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
@@ -28,6 +28,8 @@
           android:id="@+id/license_text_viewer_activity_marquee_view"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
+          android:layout_marginEnd="20dp"
+          android:minHeight="48dp"
           app:animationDelay="500"
           app:animationSpeed="10">
 
@@ -40,7 +42,7 @@
         </asia.ivity.android.marqueeview.MarqueeView>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-
+    
     <FrameLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/mark_chapters_completed_fragment.xml b/app/src/main/res/layout/mark_chapters_completed_fragment.xml
index e7bbd5fe6fb..fc5c60c372c 100644
--- a/app/src/main/res/layout/mark_chapters_completed_fragment.xml
+++ b/app/src/main/res/layout/mark_chapters_completed_fragment.xml
@@ -31,8 +31,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/mark_chapters_completed_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_mark_chapters_completed_primary_toolbar_color"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/mark_stories_completed_fragment.xml b/app/src/main/res/layout/mark_stories_completed_fragment.xml
index 1bae6f2cfff..8e6e838c5c1 100644
--- a/app/src/main/res/layout/mark_stories_completed_fragment.xml
+++ b/app/src/main/res/layout/mark_stories_completed_fragment.xml
@@ -31,8 +31,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/mark_stories_completed_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_mark_stories_completed_primary_toolbar_color"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/mark_topics_completed_fragment.xml b/app/src/main/res/layout/mark_topics_completed_fragment.xml
index 00ea5dda2ba..2af0ae9a657 100644
--- a/app/src/main/res/layout/mark_topics_completed_fragment.xml
+++ b/app/src/main/res/layout/mark_topics_completed_fragment.xml
@@ -31,8 +31,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/mark_topics_completed_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_mark_topics_completed_primary_toolbar_color"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/math_expression_parser_fragment.xml b/app/src/main/res/layout/math_expression_parser_fragment.xml
index b2ccaaedfca..31dc859f800 100644
--- a/app/src/main/res/layout/math_expression_parser_fragment.xml
+++ b/app/src/main/res/layout/math_expression_parser_fragment.xml
@@ -30,8 +30,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/math_expression_parser_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/my_downloads_fragment.xml b/app/src/main/res/layout/my_downloads_fragment.xml
index 59a605abab2..d6c7e4c565c 100644
--- a/app/src/main/res/layout/my_downloads_fragment.xml
+++ b/app/src/main/res/layout/my_downloads_fragment.xml
@@ -19,8 +19,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/my_downloads_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/my_downloads_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance"
diff --git a/app/src/main/res/layout/ongoing_topic_list_fragment.xml b/app/src/main/res/layout/ongoing_topic_list_fragment.xml
index 8c49e2fbfad..05dce1bcd8d 100644
--- a/app/src/main/res/layout/ongoing_topic_list_fragment.xml
+++ b/app/src/main/res/layout/ongoing_topic_list_fragment.xml
@@ -26,7 +26,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/ongoing_topic_list_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_ongoing_progress_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/option_activity.xml b/app/src/main/res/layout/option_activity.xml
index 9871bedd74d..ea14b6c04ba 100644
--- a/app/src/main/res/layout/option_activity.xml
+++ b/app/src/main/res/layout/option_activity.xml
@@ -39,9 +39,10 @@
   <fragment
     android:id="@+id/options_activity_fragment_navigation_drawer"
     android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
+    android:minWidth="@dimen/navigation_drawer_width"
     app:layout="@layout/drawer_fragment"
     tools:layout="@layout/drawer_fragment" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/pin_password_activity.xml b/app/src/main/res/layout/pin_password_activity.xml
index 8819be7d779..36d3f8258c9 100644
--- a/app/src/main/res/layout/pin_password_activity.xml
+++ b/app/src/main/res/layout/pin_password_activity.xml
@@ -31,7 +31,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/pin_password_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_pin_password_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
@@ -106,7 +106,7 @@
               android:id="@+id/pin_password_input_pin"
               style="@style/TextInputLayout"
               android:layout_width="0dp"
-              android:layout_height="56dp"
+              android:layout_height="wrap_content"
               android:layout_marginTop="2dp"
               android:hint="@{viewModel.profile.isAdmin ? @string/input_pin_password_as_admin : @string/input_pin_password_as_user}"
               app:errorMessage="@{viewModel.errorMessage}"
diff --git a/app/src/main/res/layout/profile_and_device_id_activity.xml b/app/src/main/res/layout/profile_and_device_id_activity.xml
index df95fa70581..740e3a89ff1 100644
--- a/app/src/main/res/layout/profile_and_device_id_activity.xml
+++ b/app/src/main/res/layout/profile_and_device_id_activity.xml
@@ -19,8 +19,9 @@
     <androidx.appcompat.widget.Toolbar
       android:id="@+id/profile_and_device_id_toolbar"
       android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
+      android:layout_height="wrap_content"
       android:background="@color/oppia_primary"
+      android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
       app:navigationContentDescription="@string/navigate_up"
       app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/profile_edit_activity.xml b/app/src/main/res/layout/profile_edit_activity.xml
index e8823ef0cee..bf264ad1989 100644
--- a/app/src/main/res/layout/profile_edit_activity.xml
+++ b/app/src/main/res/layout/profile_edit_activity.xml
@@ -18,8 +18,9 @@
     <androidx.appcompat.widget.Toolbar
       android:id="@+id/profile_edit_toolbar"
       android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
+      android:layout_height="wrap_content"
       android:background="@color/oppia_primary"
+      android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
       app:navigationContentDescription="@string/navigate_up"
       app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/profile_list_fragment.xml b/app/src/main/res/layout/profile_list_fragment.xml
index 56553b7e55a..751f35159b5 100644
--- a/app/src/main/res/layout/profile_list_fragment.xml
+++ b/app/src/main/res/layout/profile_list_fragment.xml
@@ -26,7 +26,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/profile_list_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/profile_picture_activity.xml b/app/src/main/res/layout/profile_picture_activity.xml
index b836475a5e1..02f1a177ae2 100644
--- a/app/src/main/res/layout/profile_picture_activity.xml
+++ b/app/src/main/res/layout/profile_picture_activity.xml
@@ -27,8 +27,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/profile_picture_activity_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/layout/profile_progress_header.xml b/app/src/main/res/layout/profile_progress_header.xml
index 90089232e5b..6f4a4062265 100644
--- a/app/src/main/res/layout/profile_progress_header.xml
+++ b/app/src/main/res/layout/profile_progress_header.xml
@@ -27,9 +27,9 @@
       android:background="@color/color_def_white_light"
       android:clickable="true"
       android:contentDescription="@string/current_profile_picture_content_description"
+      android:elevation="4dp"
       android:focusable="true"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
-      android:elevation="4dp"
       app:add_shadow="true"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -42,10 +42,10 @@
       android:layout_width="48dp"
       android:layout_height="48dp"
       android:contentDescription="@string/edit_profile_picture_content_description"
+      android:elevation="4dp"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:paddingStart="8dp"
       android:paddingTop="8dp"
-      android:elevation="4dp"
       app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
       app:layout_constraintEnd_toEndOf="@+id/profile_edit_image"
       app:srcCompat="@drawable/rounded_white_background_with_shadow" />
@@ -98,6 +98,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
+          android:minWidth="60dp"
           android:text="@{Integer.toString(viewModel.ongoingTopicCount)}"
           android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
           android:textSize="24sp" />
@@ -105,9 +106,10 @@
         <TextView
           android:id="@+id/ongoing_topics_description_text_view"
           style="@style/TextViewCenter"
-          android:layout_width="60dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
+          android:minWidth="60dp"
           android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
           android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
           android:textSize="12sp" />
@@ -153,9 +155,10 @@
         <TextView
           android:id="@+id/completed_stories_description_text_view"
           style="@style/TextViewCenter"
-          android:layout_width="60dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
+          android:minWidth="60dp"
           android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
           android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
           android:textSize="12sp" />
diff --git a/app/src/main/res/layout/profile_rename_activity.xml b/app/src/main/res/layout/profile_rename_activity.xml
index b1265610492..d3936c473c0 100644
--- a/app/src/main/res/layout/profile_rename_activity.xml
+++ b/app/src/main/res/layout/profile_rename_activity.xml
@@ -20,7 +20,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/profile_rename_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/profile_reset_pin_activity.xml b/app/src/main/res/layout/profile_reset_pin_activity.xml
index 6db322706ab..6dbf416e11e 100644
--- a/app/src/main/res/layout/profile_reset_pin_activity.xml
+++ b/app/src/main/res/layout/profile_reset_pin_activity.xml
@@ -19,7 +19,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/profile_reset_pin_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/promoted_story_card.xml b/app/src/main/res/layout/promoted_story_card.xml
index 95bd6ebd491..955f1337c11 100755
--- a/app/src/main/res/layout/promoted_story_card.xml
+++ b/app/src/main/res/layout/promoted_story_card.xml
@@ -25,10 +25,6 @@
       android:layout_width="@{viewModel.computeLayoutWidth(), default=match_parent}"
       android:layout_height="wrap_content"
       android:onClick="@{(v) -> viewModel.clickOnStoryTile()}"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/recently_played_stories_text_view"
       app:roundedRectDrawableWithColor="@{viewModel.promotedStory.lessonThumbnail.backgroundColorRgb}">
 
       <org.oppia.android.app.customview.LessonThumbnailImageView
diff --git a/app/src/main/res/layout/reading_text_size_activity.xml b/app/src/main/res/layout/reading_text_size_activity.xml
index a83db3f4a42..eeb2c867a24 100644
--- a/app/src/main/res/layout/reading_text_size_activity.xml
+++ b/app/src/main/res/layout/reading_text_size_activity.xml
@@ -16,7 +16,7 @@
     <androidx.appcompat.widget.Toolbar
       android:id="@+id/reading_text_size_toolbar"
       android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
+      android:layout_height="wrap_content"
       android:background="?attr/colorPrimary"
       android:fontFamily="sans-serif"
       android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/revision_card_activity.xml b/app/src/main/res/layout/revision_card_activity.xml
index f086434e8ed..0728b1029bd 100644
--- a/app/src/main/res/layout/revision_card_activity.xml
+++ b/app/src/main/res/layout/revision_card_activity.xml
@@ -21,7 +21,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/revision_card_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_concept_card_fragment_toolbar_color"
         android:gravity="center_vertical"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/story_fragment.xml b/app/src/main/res/layout/story_fragment.xml
index abb6f1d31c5..b670ae4ecf0 100644
--- a/app/src/main/res/layout/story_fragment.xml
+++ b/app/src/main/res/layout/story_fragment.xml
@@ -27,7 +27,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/story_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_story_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/topic_fragment.xml b/app/src/main/res/layout/topic_fragment.xml
index f7c4d1b1cf6..8fe08ef9e74 100644
--- a/app/src/main/res/layout/topic_fragment.xml
+++ b/app/src/main/res/layout/topic_fragment.xml
@@ -26,7 +26,7 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/topic_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/component_color_topic_fragment_primary_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/topic_practice_footer_view.xml b/app/src/main/res/layout/topic_practice_footer_view.xml
index 96b9296c8b4..491f0ee0441 100644
--- a/app/src/main/res/layout/topic_practice_footer_view.xml
+++ b/app/src/main/res/layout/topic_practice_footer_view.xml
@@ -20,7 +20,8 @@
     <Button
       android:id="@+id/topic_practice_start_button"
       style="@style/StateButtonInactive"
-      android:layout_width="160dp"
+      android:layout_width="wrap_content"
+      android:minWidth="160dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/topic_practice_footer_view_margin_top"
       android:layout_marginBottom="@dimen/topic_practice_footer_view_margin_bottom"
diff --git a/app/src/main/res/layout/view_event_logs_fragment.xml b/app/src/main/res/layout/view_event_logs_fragment.xml
index 4b3c06b7e96..b84d833c29e 100644
--- a/app/src/main/res/layout/view_event_logs_fragment.xml
+++ b/app/src/main/res/layout/view_event_logs_fragment.xml
@@ -27,8 +27,9 @@
       <androidx.appcompat.widget.Toolbar
         android:id="@+id/view_event_logs_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="@color/oppia_primary"
+        android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 7368a799ab4..60da0e8d919 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -64,7 +64,6 @@
   <dimen name="dot_gap">12dp</dimen>
   <dimen name="enter_text_view_padding_start">60dp</dimen>
   <dimen name="enter_text_view_padding_end">60dp</dimen>
-  <dimen name="promoted_story_card_width">280dp</dimen>
   <dimen name="home_padding_end">20dp</dimen>
   <dimen name="home_padding_start">20dp</dimen>
   <dimen name="home_outer_margin">28dp</dimen>
@@ -541,7 +540,10 @@
 
   <dimen name="promoted_story_card_layout_margin_end">8dp</dimen>
   <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
-  <dimen name="promoted_story_card_layout_width">280dp</dimen>
+  <!-- The width is set to sp so that it will scale according to the device screen -->
+  <dimen name="promoted_story_card_layout_width">280sp</dimen>
+  <!-- The width is set to sp so that it will scale according to the device screen -->
+  <dimen name="promoted_story_card_width">280sp</dimen>
   <dimen name="promoted_story_card_text_size">16sp</dimen>
   <dimen name="promoted_story_card_margin_top">8dp</dimen>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4a0e5f652aa..eebc151f544 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -414,6 +414,7 @@
     <item name="android:layout_height">wrap_content</item>
     <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingStart">12dp</item>
+    <item name="android:minWidth">144dp</item>
     <item name="android:background">@drawable/start_over_button_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="drawableStartCompat">@drawable/ic_start_over_24dp</item>
@@ -430,6 +431,7 @@
     <item name="android:drawablePadding">4dp</item>
     <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingStart">12dp</item>
+    <item name="android:minWidth">144dp</item>
     <item name="android:background">@drawable/state_button_primary_background</item>
     <item name="drawableEndCompat">@drawable/ic_arrow_right_alt_24dp</item>
     <item name="drawableTint">@color/color_def_white</item>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
index bd0def48687..22973649017 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
+import android.util.TypedValue
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -52,6 +53,7 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
+import org.oppia.android.app.customview.LessonThumbnailImageView
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
@@ -62,6 +64,7 @@ import org.oppia.android.app.model.OppiaLanguage.BRAZILIAN_PORTUGUESE_VALUE
 import org.oppia.android.app.model.OppiaLanguage.ENGLISH
 import org.oppia.android.app.model.OppiaLanguage.ENGLISH_VALUE
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ReadingTextSize
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.profile.ProfileChooserActivity
@@ -75,6 +78,7 @@ import org.oppia.android.app.topic.TopicActivity
 import org.oppia.android.app.translation.AppLanguageLocaleHandler
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.translation.testing.TestActivityRecreator
+import org.oppia.android.app.utility.FontScaleConfigurationUtil
 import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape
 import org.oppia.android.data.backends.gae.NetworkConfigProdModule
 import org.oppia.android.data.backends.gae.NetworkModule
@@ -198,6 +202,9 @@ class HomeActivityTest {
   @Inject
   lateinit var dataProviderTestMonitor: DataProviderTestMonitor.Factory
 
+  @Inject
+  lateinit var fontScaleConfigurationUtil: FontScaleConfigurationUtil
+
   private val internalProfileId: Int = 0
   private val internalProfileId1: Int = 1
   private val longNameInternalProfileId: Int = 3
@@ -893,6 +900,39 @@ class HomeActivityTest {
     }
   }
 
+  @Test
+  @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#4700): Make this test work on Espresso.
+  fun testHomeActivity_promotedStoryHasScalableWidth() {
+    fontScaleConfigurationUtil.adjustFontScale(context, ReadingTextSize.EXTRA_LARGE_TEXT_SIZE)
+    fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)
+    storyProgressTestHelper.markInProgressSavedFractionsStory0Exp0(
+      profileId = profileId1,
+      timestampOlderThanOneWeek = false
+    )
+    logIntoUserTwice()
+    launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
+      testCoroutineDispatchers.runCurrent()
+      scrollToPosition(position = 1)
+      onView(
+        atPositionOnView(
+          recyclerViewId = R.id.home_recycler_view,
+          position = 1,
+          targetViewId = R.id.promoted_story_list_recycler_view
+        )
+      ).check { view, _ ->
+        val promotedStoryCard =
+          view.findViewById<LessonThumbnailImageView>(R.id.lesson_thumbnail)
+        val promotedStoryCardWidth = promotedStoryCard?.width?.toFloat()
+        val expectedWidthInPixels = TypedValue.applyDimension(
+          TypedValue.COMPLEX_UNIT_SP,
+          280F,
+          context.resources.displayMetrics
+        )
+        assertThat(promotedStoryCardWidth).isWithin(1e-5f).of(expectedWidthInPixels)
+      }
+    }
+  }
+
   @Test
   fun testHomeActivity_promotedCard_topicNameIsCorrect() {
     fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)