diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f14ef3f518e..11592246d65 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,348 +18,324 @@
   <dimen name="bottom_white_space">160dp</dimen>
   <dimen name="text_input_layout_corner_radius">4dp</dimen>
   <dimen name="text_input_layout_stroke_width">1dp</dimen>
+  <dimen name="default_reading_text_size">18sp</dimen>
 
-  <dimen name="clickable_item_min_height">48dp</dimen>
+  <dimen name="space_0dp">0dp</dimen>
+  <dimen name="dot_width_height">12dp</dimen>
+  <dimen name="dot_gap">12dp</dimen>
 
+  <!-- Ongoing Story Card View -->
   <dimen name="ongoing_story_card_view_is_tablet_margin_top">28dp</dimen>
   <dimen name="ongoing_story_card_view_margin_top_portrait_story_grid_greater_then_2">28dp</dimen>
   <dimen name="ongoing_story_card_view_margin_top_landscape">28dp</dimen>
+  <dimen name="ongoing_story_card_view_margin_top_portrait">16dp</dimen>
+
+  <!-- Font Scale -->
   <dimen name="font_scale_content_extra_large_text_view_size">28dp</dimen>
-  <dimen name="state_fragment_non_split_view_margin_end">28dp</dimen>
-  <dimen name="state_fragment_non_split_view_margin_start">28dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_bottom_profile_not_added">28dp</dimen>
+  <dimen name="font_scale_content_small_text_view_size">16dp</dimen>
+  <dimen name="font_scale_content_large_text_view_size">24dp</dimen>
+  <dimen name="font_scale_content_text_size">20dp</dimen>
+
+  <!-- Profile Chooser Fragment -->
+  <dimen name="profile_chooser_fragment_profile_select_text_margin_top">64dp</dimen>
+  <dimen name="profile_chooser_fragment_profile_recycler_view_margin_top">36dp</dimen>
+  <dimen name="profile_chooser_fragment_margin_top_profile_already_added">24dp</dimen>
+
+  <!--  Profile Chooser Profile View -->
+  <dimen name="profile_chooser_profile_view_view_margin_top">60dp</dimen>
   <dimen name="profile_chooser_profile_view_margin_bottom_profile_not_added">28dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_start_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_top_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_bottom_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_start">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_end">16dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_end_profile_already_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_top_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_start_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_margin_end_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_profile_view_divider_margin_top">40dp</dimen>
+  <dimen name="profile_chooser_profile_view_name_margin_top_profile_already_added">8dp</dimen>
+  <dimen name="profile_chooser_profile_view_circular_image_margin_top_profile_already_added">48dp</dimen>
+  <dimen name="profile_chooser_profile_view_parent_margin_start_profile_not_added">298dp</dimen>
+  <dimen name="profile_chooser_profile_view_parent_margin_end_profile_not_added">298dp</dimen>
+  <dimen name="profile_chooser_profile_view_parent_padding">4dp</dimen>
+  <dimen name="profile_chooser_profile_view_is_admin_margin_top_profile_already_added">8dp</dimen>
+  <dimen name="profile_chooser_profile_view_is_admin_margin_top">4dp</dimen>
+  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_not_added">4dp</dimen>
+  <dimen name="profile_chooser_profile_view_last_visited_margin_start_profile_not_added">12dp</dimen>
+  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_already_added">8dp</dimen>
 
+  <!-- Profile Chooser Margin -->
+  <dimen name="profile_chooser_margin_start_profile_already_added">72dp</dimen>
+  <dimen name="profile_chooser_margin_end_profile_already_added">72dp</dimen>
+  <dimen name="profile_chooser_margin_top_profile_already_added">0dp</dimen>
+  <dimen name="profile_chooser_margin_top_profile_not_added">84dp</dimen>
+  <dimen name="profile_chooser_setting_icon_margin_end">96dp</dimen>
+  <dimen name="profile_chooser_profile_select_text_margin_start">96dp</dimen>
+  <dimen name="profile_chooser_padding_bottom_profile_already_added">224dp</dimen>
+  <dimen name="profile_chooser_administrator_controls_margin_bottom">28dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_bottom_profile_not_added">28dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_start_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_end_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_top_profile_already_added">16dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_top_profile_not_added">60dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_end_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_add_view_margin_start_profile_not_added">24dp</dimen>
   <dimen name="profile_chooser_add_view_parent_margin_start_profile_not_added">298dp</dimen>
   <dimen name="profile_chooser_add_view_parent_margin_end_profile_not_added">298dp</dimen>
-  <dimen name="profile_chooser_profile_view_parent_margin_start_profile_not_added">298dp</dimen>
-  <dimen name="profile_chooser_profile_view_parent_margin_end_profile_not_added">298dp</dimen>
+  <dimen name="profile_chooser_add_view_circular_image_margin_top_profile_already_added">48dp</dimen>
+  <dimen name="profile_chooser_description_margin_start_profile_not_added">24dp</dimen>
+  <dimen name="profile_chooser_description_margin_end_profile_not_added">24dp</dimen>
 
+  <!-- DragAndDrop -->
   <dimen name="drag_drop_item_exploration_split_view_margin_end">40dp</dimen>
+  <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
+  <dimen name="drag_drop_item_exploration_split_view_margin_top">32dp</dimen>
   <dimen name="drag_drop_item_exploration_view_margin_start">40dp</dimen>
+  <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen>
+  <dimen name="drag_drop_item_exploration_view_margin_end">24dp</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="drag_drop_item_question_split_view_margin_top">40dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_end">32dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_start">32dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_start">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_top">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_end">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_padding_bottom">16dp</dimen>
+  <dimen name="drag_drop_interaction_item_recycler_view_margin_top">4dp</dimen>
+  <dimen name="drag_drop_interaction_items_margin_top">4dp</dimen>
+  <dimen name="drag_drop_interaction_items_margin_bottom">4dp</dimen>
+  <dimen name="drag_drop_interaction_item_exploration_view_margin_start">80dp</dimen>
+  <dimen name="drag_drop_grouping_hint_split_text_view_margin_top">16dp</dimen>
+  <dimen name="drag_drop_grouping_hint_split_text_view_margin_start">16dp</dimen>
+  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_start">12dp</dimen>
+  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_top">8dp</dimen>
+  <dimen name="drag_drop_container_parent_non_split_margin_end">8dp</dimen>
+  <dimen name="drag_drop_container_parent_non_split_margin_start">8dp</dimen>
+  <dimen name="drag_drop_content_group_item_margin">8dp</dimen>
+
+  <!-- State Fragment -->
+  <dimen name="state_fragment_with_audio_bar_visible_padding_top">72dp</dimen>
+  <dimen name="state_fragment_padding_top_audio_bar_visible">48dp</dimen>
+  <dimen name="state_fragment_split_view_margin_start">32dp</dimen>
+  <dimen name="state_fragment_split_view_margin_end">32dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_end">28dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_start">28dp</dimen>
+
+  <!-- Input Interaction Item Conversation View -->
   <dimen name="numeric_input_interaction_item_conversation_view_margin_start">40dp</dimen>
+  <dimen name="numeric_input_interaction_item_conversation_view_margin_end">24dp</dimen>
   <dimen name="ratio_input_interaction_item_conversation_view_margin_start">40dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_start">40dp</dimen>
-  <dimen name="submitted_answer_exploration_view_margin_start">40dp</dimen>
+  <dimen name="ratio_input_interaction_item_conversation_view_margin_end">24dp</dimen>
   <dimen name="text_input_interaction_item_conversation_view_margin_start">40dp</dimen>
+  <dimen name="text_input_interaction_item_conversation_view_margin_end">24dp</dimen>
+  <dimen name="text_input_interaction_item_margin_start">80dp</dimen>
+
+  <!-- Submitted Answer -->
+  <dimen name="submitted_answer_exploration_split_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_end">24dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_exploration_split_view_margin_start_no_extra_interaction_answer">40dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
   <dimen name="submitted_answer_exploration_split_view_margin_top_extra_interaction_answer">40dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_end_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_exploration_split_view_margin_start_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_exploration_view_margin_start">40dp</dimen>
+  <dimen name="submitted_answer_exploration_view_margin_end">24dp</dimen>
+  <dimen name="submitted_answer_exploration_view_margin_top">24dp</dimen>
   <dimen name="submitted_answer_question_split_view_margin_start_no_extra_interaction_answer">40dp</dimen>
   <dimen name="submitted_answer_question_split_view_margin_top_extra_interaction_answer">40dp</dimen>
-  <dimen name="profile_chooser_profile_view_divider_margin_top">40dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_end_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_start_extra_interaction_answer">64dp</dimen>
+  <dimen name="submitted_answer_question_split_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_question_view_margin_top">24dp</dimen>
+  <dimen name="submitted_answer_question_view_margin_end">64dp</dimen>
+  <dimen name="submitted_answer_question_view_margin_start">64dp</dimen>
+  <dimen name="submitted_answer_text_conversation_view_padding_bottom">16dp</dimen>
+  <dimen name="submitted_answer_text_conversation_view_padding_top">16dp</dimen>
+  <dimen name="submitted_answer_text_non_conversation_view_padding_top">8dp</dimen>
+  <dimen name="submitted_answer_text_non_conversation_view_padding_bottom">8dp</dimen>
 
   <!-- Profile List Profile View -->
   <dimen name="profile_list_profile_view_margin_start">28dp</dimen>
 
-  <dimen name="profile_chooser_profile_view_parent_padding">4dp</dimen>
-  <dimen name="profile_chooser_profile_view_is_admin_margin_top">4dp</dimen>
-  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_not_added">4dp</dimen>
-  <dimen name="space_0dp">0dp</dimen>
-  <dimen name="dot_width_height">12dp</dimen>
-  <dimen name="dot_gap">12dp</dimen>
+  <!-- Profile View -->
+  <dimen name="profile_view_already_added_margin">20dp</dimen>
+  <dimen name="profile_view_already_added_description_parent_margin_top">8dp</dimen>
+  <dimen name="profile_view_not_added_margin">20dp</dimen>
+
+  <!-- Enter Text View -->
   <dimen name="enter_text_view_padding_start">60dp</dimen>
   <dimen name="enter_text_view_padding_end">60dp</dimen>
-  <dimen name="home_padding_end">20dp</dimen>
-  <dimen name="home_padding_start">20dp</dimen>
-  <dimen name="home_outer_margin">28dp</dimen>
-  <dimen name="home_welcome_outer_padding">28dp</dimen>
-  <dimen name="home_welcome_text_view_margin_end">4dp</dimen>
-  <dimen name="home_inner_margin">8dp</dimen>
-  <dimen name="recently_played_margin_max">28dp</dimen>
-  <dimen name="recently_played_margin_min">8dp</dimen>
-  <dimen name="coming_soon_padding_end">16dp</dimen>
-  <dimen name="coming_soon_padding_start">12dp</dimen>
 
-  <dimen name="default_reading_text_size">18sp</dimen>
-  <dimen name="font_scale_content_text_size">20dp</dimen>
-  <dimen name="profile_view_already_added_margin">20dp</dimen>
-  <dimen name="profile_view_not_added_margin">20dp</dimen>
+  <!-- Walkthrough Fragment -->
   <dimen name="walkthrough_topic_summary_container_margin">20dp</dimen>
+  <dimen name="walkthrough_final_fragment_card_content_padding">24dp</dimen>
+  <dimen name="walkthrough_final_no_button_margin_end">8dp</dimen>
+  <dimen name="walkthrough_final_yes_button_margin_start">8dp</dimen>
 
-  <dimen name="ongoing_story_card_view_margin_top_portrait">16dp</dimen>
-  <dimen name="font_scale_content_small_text_view_size">16dp</dimen>
+  <!-- Continue Interaction Item -->
   <dimen name="continue_interaction_item_exploration_view_margin_top">16dp</dimen>
+  <dimen name="continue_interaction_item_exploration_view_margin_end">24dp</dimen>
+  <dimen name="continue_interaction_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_bottom">16dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_end">16dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_start">16dp</dimen>
   <dimen name="continue_interaction_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_margin_top">16dp</dimen>
+  <dimen name="continue_interaction_item_question_view_margin_end">24dp</dimen>
+  <dimen name="continue_interaction_item_question_view_margin_start">24dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_bottom">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_end">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_start">16dp</dimen>
   <dimen name="continue_interaction_item_question_view_padding_top">16dp</dimen>
+
+  <!-- Continue Navigation Item -->
   <dimen name="continue_navigation_item_exploration_view_margin_top">16dp</dimen>
+  <dimen name="continue_navigation_item_exploration_view_margin_end">24dp</dimen>
+  <dimen name="continue_navigation_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_bottom">16dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_end">16dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_start">16dp</dimen>
   <dimen name="continue_navigation_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_margin_top">16dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_end">24dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_start">24dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_bottom">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_end">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_start">16dp</dimen>
   <dimen name="continue_navigation_item_question_view_padding_top">16dp</dimen>
-  <dimen name="drag_drop_grouping_hint_split_text_view_margin_top">16dp</dimen>
-  <dimen name="drag_drop_grouping_hint_split_text_view_margin_start">16dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_start_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_end_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_top_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_start_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_top_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_bottom_profile_already_added">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_start">16dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_end">16dp</dimen>
-  <dimen name="submitted_answer_text_conversation_view_padding_bottom">16dp</dimen>
-  <dimen name="submitted_answer_text_conversation_view_padding_top">16dp</dimen>
-
-  <dimen name="topic_list_item_margin_top_bottom">12dp</dimen>
-  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_start">12dp</dimen>
-  <dimen name="profile_chooser_profile_view_last_visited_margin_start_profile_not_added">12dp</dimen>
-
-  <dimen name="font_scale_content_large_text_view_size">24dp</dimen>
-  <dimen name="continue_interaction_item_exploration_view_margin_end">24dp</dimen>
-  <dimen name="continue_interaction_item_exploration_view_margin_start">24dp</dimen>
-  <dimen name="continue_interaction_item_question_view_margin_end">24dp</dimen>
-  <dimen name="continue_interaction_item_question_view_margin_start">24dp</dimen>
-  <dimen name="continue_navigation_item_question_view_margin_end">24dp</dimen>
-  <dimen name="continue_navigation_item_question_view_margin_start">24dp</dimen>
-  <dimen name="continue_navigation_item_exploration_view_margin_end">24dp</dimen>
-  <dimen name="continue_navigation_item_exploration_view_margin_start">24dp</dimen>
-  <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen>
-  <dimen name="drag_drop_item_exploration_view_margin_end">24dp</dimen>
-  <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen>
-  <dimen name="numeric_input_interaction_item_conversation_view_margin_end">24dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_top_profile_not_added">60dp</dimen>
-  <dimen name="profile_chooser_description_margin_start_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_description_margin_end_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_end_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_add_view_margin_start_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_end_profile_already_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_top_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_start_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_profile_view_margin_end_profile_not_added">24dp</dimen>
-  <dimen name="profile_chooser_fragment_margin_top_profile_already_added">24dp</dimen>
-  <dimen name="ratio_input_interaction_item_conversation_view_margin_end">24dp</dimen>
-  <dimen name="submitted_answer_exploration_view_margin_end">24dp</dimen>
-  <dimen name="submitted_answer_exploration_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_end">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_question_view_margin_top">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_end_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_top_no_extra_interaction_answer">24dp</dimen>
-  <dimen name="text_input_interaction_item_conversation_view_margin_end">24dp</dimen>
-  <dimen name="walkthrough_final_fragment_card_content_padding">24dp</dimen>
-
-  <dimen name="admin_auth_input_pin_label_margin">8dp</dimen>
-  <dimen name="drag_drop_grouping_hint_non_split_text_view_margin_top">8dp</dimen>
-  <dimen name="drag_drop_container_parent_non_split_margin_end">8dp</dimen>
-  <dimen name="drag_drop_container_parent_non_split_margin_start">8dp</dimen>
-  <dimen name="profile_chooser_profile_view_name_margin_top_profile_already_added">8dp</dimen>
-  <dimen name="profile_chooser_profile_view_last_visited_margin_top_profile_already_added">8dp</dimen>
-  <dimen name="profile_chooser_profile_view_is_admin_margin_top_profile_already_added">8dp</dimen>
-  <dimen name="profile_view_already_added_description_parent_margin_top">8dp</dimen>
-  <dimen name="submitted_answer_text_non_conversation_view_padding_top">8dp</dimen>
-  <dimen name="submitted_answer_text_non_conversation_view_padding_bottom">8dp</dimen>
-  <dimen name="drag_drop_content_group_item_margin">8dp</dimen>
-  <dimen name="walkthrough_final_no_button_margin_end">8dp</dimen>
-  <dimen name="walkthrough_final_yes_button_margin_start">8dp</dimen>
 
   <!-- AdminAuthActivity -->
   <dimen name="admin_auth_activity_layout_width">0dp</dimen>
+  <dimen name="admin_auth_activity_input_width">0dp</dimen>
+  <dimen name="admin_auth_input_pin_label_margin">8dp</dimen>
   <dimen name="admin_auth_activity_margin_start">28dp</dimen>
   <dimen name="admin_auth_activity_margin_end">28dp</dimen>
   <dimen name="admin_auth_activity_padding_top">32dp</dimen>
   <dimen name="admin_auth_activity_padding_bottom">96dp</dimen>
   <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
   <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
-  <dimen name="admin_auth_activity_input_width">0dp</dimen>
 
   <!-- AdminPinActivity -->
   <dimen name="admin_pin_activity_layout_width">@dimen/match_parent</dimen>
+  <dimen name="admin_pin_activity_input_width">0dp</dimen>
   <dimen name="admin_pin_activity_margin_start">28dp</dimen>
   <dimen name="admin_pin_activity_margin_end">28dp</dimen>
   <dimen name="admin_pin_activity_padding_top">32dp</dimen>
   <dimen name="admin_pin_activity_padding_bottom">96dp</dimen>
   <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
   <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
-  <dimen name="admin_pin_activity_input_width">0dp</dimen>
 
   <!-- PinPasswordActivity -->
   <dimen name="pin_password_activity_layout_width">0dp</dimen>
+  <!-- -1px is equivalent to match_parent (https://stackoverflow.com/a/37971851/12314934) -->
+  <dimen name="pin_password_activity_input_with_icon_width">-1px</dimen>
   <dimen name="pin_password_activity_margin_start">28dp</dimen>
   <dimen name="pin_password_activity_margin_end">28dp</dimen>
   <dimen name="pin_password_activity_padding_top">40dp</dimen>
   <dimen name="pin_password_activity_hello_text_view_margin_start">0dp</dimen>
   <dimen name="pin_password_activity_hello_text_view_margin_end">0dp</dimen>
-  <!-- -1px is equivalent to match_parent (https://stackoverflow.com/a/37971851/12314934) -->
-  <dimen name="pin_password_activity_input_with_icon_width">-1px</dimen>
-
-  <dimen name="submitted_answer_question_view_margin_end">64dp</dimen>
-  <dimen name="submitted_answer_question_view_margin_start">64dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_end_extra_interaction_answer">64dp</dimen>
-  <dimen name="submitted_answer_exploration_split_view_margin_start_extra_interaction_answer">64dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_end_extra_interaction_answer">64dp</dimen>
-  <dimen name="submitted_answer_question_split_view_margin_start_extra_interaction_answer">64dp</dimen>
 
+  <!-- Story Chapter Card -->
   <dimen name="story_chapter_card_playable_state_elevation">4dp</dimen>
-  <dimen name="ongoing_topic_card_elevation">4dp</dimen>
   <dimen name="story_chapter_card_not_playable_state_elevation">2dp</dimen>
-  <dimen name="profile_chooser_padding_bottom_profile_already_added">224dp</dimen>
-
-  <dimen name="state_fragment_with_audio_bar_visible_padding_top">72dp</dimen>
-  <dimen name="profile_chooser_margin_start_profile_already_added">72dp</dimen>
-  <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="text_input_interaction_item_margin_start">80dp</dimen>
-
-  <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
-  <dimen name="drag_drop_item_exploration_split_view_margin_top">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="drag_drop_item_question_view_margin_end">32dp</dimen>
-  <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="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>
+  <!-- Ongoing Topic Card -->
+  <dimen name="ongoing_topic_card_elevation">4dp</dimen>
 
-  <!-- Content Item: Exploration Split View -->
+  <!-- Content Item -->
   <dimen name="content_item_exploration_split_view_margin_start">24dp</dimen>
   <dimen name="content_item_exploration_split_view_margin_top">24dp</dimen>
   <dimen name="content_item_exploration_split_view_margin_end">40dp</dimen>
-
   <dimen name="content_item_exploration_split_view_padding_start">12dp</dimen>
   <dimen name="content_item_exploration_split_view_padding_top">16dp</dimen>
   <dimen name="content_item_exploration_split_view_padding_end">12dp</dimen>
   <dimen name="content_item_exploration_split_view_padding_bottom">16dp</dimen>
-
-  <!-- Content Item: Exploration View -->
   <dimen name="content_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="content_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="content_item_exploration_view_margin_end">40dp</dimen>
-
   <dimen name="content_item_exploration_view_padding_start">12dp</dimen>
   <dimen name="content_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="content_item_exploration_view_padding_end">12dp</dimen>
   <dimen name="content_item_exploration_view_padding_bottom">16dp</dimen>
-
-  <!-- Content Item: Question Split View -->
   <dimen name="content_item_question_split_view_margin_start">32dp</dimen>
   <dimen name="content_item_question_split_view_margin_top">24dp</dimen>
   <dimen name="content_item_question_split_view_margin_end">32dp</dimen>
   <dimen name="content_item_question_split_view_margin_bottom">8dp</dimen>
-
-  <!-- Content Item: Question View -->
   <dimen name="content_item_question_view_margin_start">32dp</dimen>
   <dimen name="content_item_question_view_margin_top">32dp</dimen>
   <dimen name="content_item_question_view_margin_end">32dp</dimen>
   <dimen name="content_item_question_view_margin_bottom">8dp</dimen>
 
-  <!-- Feedback Item: Exploration Split View -->
+  <!-- Feedback Item -->
   <dimen name="feedback_item_exploration_split_view_margin_start">24dp</dimen>
   <dimen name="feedback_item_exploration_split_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_exploration_split_view_margin_end">40dp</dimen>
-
   <dimen name="feedback_item_exploration_split_view_padding_start">12dp</dimen>
   <dimen name="feedback_item_exploration_split_view_padding_top">16dp</dimen>
   <dimen name="feedback_item_exploration_split_view_padding_end">12dp</dimen>
   <dimen name="feedback_item_exploration_split_view_padding_bottom">16dp</dimen>
-
-  <!-- Feedback Item: Exploration View -->
   <dimen name="feedback_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="feedback_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_exploration_view_margin_end">40dp</dimen>
-
   <dimen name="feedback_item_exploration_view_padding_start">12dp</dimen>
   <dimen name="feedback_item_exploration_view_padding_top">16dp</dimen>
   <dimen name="feedback_item_exploration_view_padding_end">12dp</dimen>
   <dimen name="feedback_item_exploration_view_padding_bottom">16dp</dimen>
-
-  <!-- Feedback Item: Question Split View -->
   <dimen name="feedback_item_question_split_view_margin_start">32dp</dimen>
   <dimen name="feedback_item_question_split_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_question_split_view_margin_end">32dp</dimen>
-
-  <!-- Feedback Item: Question View -->
   <dimen name="feedback_item_question_view_margin_start">32dp</dimen>
   <dimen name="feedback_item_question_view_margin_top">24dp</dimen>
   <dimen name="feedback_item_question_view_margin_end">32dp</dimen>
 
-  <!-- Interaction Item: Exploration View -->
+  <!-- Interaction Item -->
   <dimen name="interaction_item_exploration_view_margin_start">40dp</dimen>
   <dimen name="interaction_item_exploration_view_margin_top">24dp</dimen>
   <dimen name="interaction_item_exploration_view_margin_end">24dp</dimen>
   <dimen name="interaction_item_exploration_view_padding_start">40dp</dimen>
   <dimen name="interaction_item_exploration_view_padding_end">24dp</dimen>
-
-  <!-- Interaction Item: Question View -->
   <dimen name="interaction_item_question_view_margin_start">32dp</dimen>
   <dimen name="interaction_item_question_view_margin_top">24dp</dimen>
   <dimen name="interaction_item_question_view_margin_end">32dp</dimen>
   <dimen name="interaction_item_question_view_padding_start">32dp</dimen>
   <dimen name="interaction_item_question_view_padding_end">32dp</dimen>
-
-
-  <!-- Interaction Item: Exploration/Question Split View -->
   <dimen name="interaction_item_split_view_margin_start">32dp</dimen>
   <dimen name="interaction_item_split_view_margin_top">24dp</dimen>
   <dimen name="interaction_item_split_view_margin_end">32dp</dimen>
 
-  <!-- DragAndDrop Interaction Item -->
-  <dimen name="drag_drop_interaction_item_padding_start">16dp</dimen>
-  <dimen name="drag_drop_interaction_item_padding_top">16dp</dimen>
-  <dimen name="drag_drop_interaction_item_padding_end">16dp</dimen>
-  <dimen name="drag_drop_interaction_item_padding_bottom">16dp</dimen>
-
-  <dimen name="drag_drop_interaction_item_recycler_view_margin_top">4dp</dimen>
-
-  <dimen name="drag_drop_interaction_items_margin_top">4dp</dimen>
-  <dimen name="drag_drop_interaction_items_margin_bottom">4dp</dimen>
-
   <!-- Selection Interaction Item -->
   <dimen name="selection_interaction_item_padding_start">16dp</dimen>
   <dimen name="selection_interaction_item_padding_end">16dp</dimen>
 
-  <!-- Submitted Answer Item: Exploration Split View -->
+  <!-- Submitted Answer Item -->
   <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 -->
+  <!-- Previous Responses Item -->
   <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen>
-
-  <!-- Previous Responses Item: Exploration View -->
   <dimen name="previous_responses_item_exploration_view_margin_start">36dp</dimen>
   <dimen name="previous_responses_item_exploration_view_margin_end">52dp</dimen>
-
-  <!-- Previous Responses Item: Question Split View -->
   <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen>
   <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen>
-
-  <!-- Previous Responses Item: Question View -->
   <dimen name="previous_responses_item_question_view_margin_start">44dp</dimen>
   <dimen name="previous_responses_item_question_view_margin_end">44dp</dimen>
 
@@ -369,44 +345,33 @@
     the shadows are clearly visible around the buttons.
   -->
 
-  <!-- General Button Item: Common Margin Top -->
+  <!-- General Button Item -->
   <dimen name="general_button_item_split_view_margin_top_left">20dp</dimen>
   <dimen name="general_button_item_split_view_margin_top_right">68dp</dimen>
   <dimen name="general_button_item_margin_top">20dp</dimen>
-
-  <!-- General Button Item: Exploration Split View -->
   <dimen name="general_button_item_exploration_split_view_margin_start">44dp</dimen>
   <dimen name="general_button_item_exploration_split_view_margin_end">44dp</dimen>
-
-  <!-- General Button: Exploration View -->
   <dimen name="general_button_item_exploration_view_margin_start">24dp</dimen>
   <dimen name="general_button_item_exploration_view_margin_end">24dp</dimen>
   <dimen name="general_button_item_exploration_view_padding_start">24dp</dimen>
   <dimen name="general_button_item_exploration_view_padding_end">24dp</dimen>
-
-  <!-- General Button: Question Split View -->
   <dimen name="general_button_item_question_split_view_margin_start">44dp</dimen>
   <dimen name="general_button_item_question_split_view_margin_end">44dp</dimen>
-
-  <!-- General Button: Question View -->
   <dimen name="general_button_item_question_view_margin_start">24dp</dimen>
   <dimen name="general_button_item_question_view_margin_end">24dp</dimen>
   <dimen name="general_button_item_question_view_padding_start">24dp</dimen>
   <dimen name="general_button_item_question_view_padding_end">24dp</dimen>
 
-  <!-- Return to Topic Button: Exploration View -->
+  <!-- Return to Topic Button -->
   <dimen name="return_to_topic_button_item_exploration_view_margin_top">44dp</dimen>
-
-  <!-- Return to Topic Button: Question View -->
   <dimen name="return_to_topic_button_item_question_view_margin_top">8dp</dimen>
 
-  <!-- Replay Button: Question View -->
+  <!-- Replay Button -->
   <dimen name="replay_button_item_question_view_margin_top">44dp</dimen>
 
   <!-- Question Player ProgressBar -->
   <dimen name="question_player_progress_bar_margin_start">32dp</dimen>
   <dimen name="question_player_progress_bar_margin_end">32dp</dimen>
-
   <dimen name="question_player_progress_bar_text_margin_bottom">12dp</dimen>
   <dimen name="question_player_progress_bar_text_margin_end">32dp</dimen>
   <dimen name="question_player_progress_bar_text_margin_top">8dp</dimen>
@@ -419,11 +384,18 @@
   <!-- KonfettiView height -->
   <dimen name="konfetti_view_height">124dp</dimen>
 
-  <!-- Audio Player: Non Split View -->
+  <!-- Clickable Item Min height -->
+  <dimen name="clickable_item_min_height">48dp</dimen>
+
+  <!-- Topic List Item -->
+  <dimen name="topic_list_item_margin_top_bottom">12dp</dimen>
+
+  <!-- Master Skills Text View -->
+  <dimen name="master_skills_text_view_margin_end">88dp</dimen>
+
+  <!-- Audio Player -->
   <dimen name="audio_player_non_split_view_margin_start">28dp</dimen>
   <dimen name="audio_player_non_split_view_margin_end">28dp</dimen>
-
-  <!-- Audio Player: Split View -->
   <dimen name="audio_player_split_view_margin_start">32dp</dimen>
   <dimen name="audio_player_split_view_margin_end">32dp</dimen>
 
@@ -438,18 +410,22 @@
   <dimen name="faq_single_padding_bottom">60dp</dimen>
   <dimen name="faq_single_activity_scroll_padding_bottom">80dp</dimen>
 
-  <!-- Privacy Policy -->
+  <!-- Privacy Policy Fragment -->
   <dimen name="policies_fragment_page_padding_start">24dp</dimen>
   <dimen name="policies_fragment_page_padding_top">22dp</dimen>
   <dimen name="policies_fragment_page_padding_end">28dp</dimen>
   <dimen name="policies_fragment_page_padding_bottom">60dp</dimen>
   <dimen name="policies_fragment_page_scroll_padding_bottom">80dp</dimen>
 
-  <!-- FAQ -->
+  <!-- FAQ List -->
   <dimen name="faq_list_scroll_padding_bottom">80dp</dimen>
   <dimen name="faq_list_padding_bottom">60dp</dimen>
+
+  <!-- FAQ Content -->
   <dimen name="faq_content_margin_start">28dp</dimen>
   <dimen name="faq_content_margin_end">28dp</dimen>
+
+  <!-- FAQ Item Header -->
   <dimen name="faq_item_header_margin_start">24dp</dimen>
   <dimen name="faq_item_header_margin_top">24dp</dimen>
   <dimen name="faq_item_header_margin_end">24dp</dimen>
@@ -461,13 +437,15 @@
   <!-- General Bottom Padding -->
   <dimen name="general_screen_padding_bottom">128dp</dimen>
 
-  <!-- Profile Edit -->
+  <!-- Profile Edit Delete -->
   <dimen name="profile_edit_delete_margin_bottom">12dp</dimen>
 
-  <!-- Concept Card Fragment -->
+  <!-- Concept Card: Heading Text -->
   <dimen name="concept_card_heading_text_margin_start">28dp</dimen>
   <dimen name="concept_card_heading_text_margin_top">40dp</dimen>
   <dimen name="concept_card_heading_text_margin_end">28dp</dimen>
+
+  <!-- Concept Card: Explanation Text -->
   <dimen name="concept_card_explanation_text_margin_start">40dp</dimen>
   <dimen name="concept_card_explanation_text_margin_top">28dp</dimen>
   <dimen name="concept_card_explanation_text_margin_end">40dp</dimen>
@@ -478,17 +456,9 @@
   <dimen name="all_topics_text_margin_end">32dp</dimen>
   <dimen name="all_topics_text_margin_bottom">12dp</dimen>
 
-  <!-- Profile Chooser Fragment -->
-  <dimen name="profile_chooser_fragment_profile_select_text_margin_top">64dp</dimen>
-  <dimen name="profile_chooser_fragment_profile_recycler_view_margin_top">36dp</dimen>
-  <dimen name="profile_chooser_profile_view_view_margin_top">60dp</dimen>
-  <dimen name="profile_chooser_profile_select_text_margin_start">96dp</dimen>
-  <dimen name="profile_chooser_margin_top_profile_already_added">0dp</dimen>
-  <dimen name="profile_chooser_margin_top_profile_not_added">84dp</dimen>
-  <dimen name="profile_chooser_administrator_controls_margin_bottom">28dp</dimen>
-  <dimen name="profile_chooser_setting_icon_margin_end">96dp</dimen>
-
-  <!-- Coming Soon Topic List -->
+  <!-- Coming Soon -->
+  <dimen name="coming_soon_padding_end">16dp</dimen>
+  <dimen name="coming_soon_padding_start">12dp</dimen>
   <dimen name="coming_soon_topic_list_constraint_layout_padding_start">0dp</dimen>
   <dimen name="coming_soon_topic_list_constraint_layout_padding_end">0dp</dimen>
   <dimen name="coming_soon_topic_list_constraint_layout_margin_top">24dp</dimen>
@@ -498,7 +468,7 @@
   <dimen name="coming_soon_topic_promoted_list_view_padding_start">28dp</dimen>
   <dimen name="coming_soon_topic_Promoted_list_view_padding_end">28dp</dimen>
 
-  <!-- Topic Practice Footer View -->
+  <!-- Topic Practice -->
   <dimen name="topic_practice_footer_view_margin_top">36dp</dimen>
   <dimen name="topic_practice_footer_view_margin_bottom">108dp</dimen>
 
@@ -519,7 +489,7 @@
   <dimen name="completed_story_list_fragment_recyclerview_padding_end">20dp</dimen>
   <dimen name="completed_story_list_fragment_recyclerview_padding_bottom">144dp</dimen>
 
-  <!-- App Version -->
+  <!-- App Version Text/Image View -->
   <dimen name="app_version_text_view_padding_start">16dp</dimen>
   <dimen name="app_version_text_view_padding_end">16dp</dimen>
   <dimen name="app_version_image_view_margin_start">24dp</dimen>
@@ -532,18 +502,35 @@
   <dimen name="add_profile_pin_checkbox_margin_top">32dp</dimen>
   <dimen name="add_profile_confirm_pin_margin_top">24dp</dimen>
 
+  <!-- Home Fragment -->
   <dimen name="home_fragment_padding_top">36dp</dimen>
   <dimen name="home_fragment_padding_bottom">148dp</dimen>
+  <dimen name="home_padding_end">20dp</dimen>
+  <dimen name="home_padding_start">20dp</dimen>
+  <dimen name="home_inner_margin">8dp</dimen>
+  <dimen name="home_outer_margin">28dp</dimen>
+  <dimen name="home_welcome_outer_padding">28dp</dimen>
+  <dimen name="home_welcome_text_view_margin_end">4dp</dimen>
+
+  <!-- These values are getting used only in tablet mode and therefore mentioned as 0dp here -->
+  <!-- Profile Progress Header -->
+  <dimen name="profile_edit_image_layout_margin_start">0dp</dimen>
+  <dimen name="profile_name_text_view_layout_margin_end">0dp</dimen>
+  <dimen name="view_all_text_view_margin_end">0dp</dimen>
+  <dimen name="recently_played_stories_text_view_layout_margin_start">0dp</dimen>
 
-  <!-- Recently Played -->
+  <!-- Recently Played Fragment -->
   <dimen name="recently_played_fragment_padding_top">8dp</dimen>
   <dimen name="recently_played_fragment_padding_bottom">168dp</dimen>
 
+  <dimen name="recently_played_margin_max">28dp</dimen>
+  <dimen name="recently_played_margin_min">8dp</dimen>
+
+  <!-- Promoted Story Card -->
   <dimen name="promoted_story_card_layout_margin_end">8dp</dimen>
   <dimen name="promoted_story_card_layout_margin_start">8dp</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>
@@ -563,13 +550,6 @@
   <dimen name="story_header_view_layout_margin_start">32dp</dimen>
   <dimen name="story_header_view_layout_margin_end">32dp</dimen>
 
-  <!-- These values are getting used only in tablet mode and therefore mentioned as 0dp here -->
-  <!-- Profile Progress Header -->
-  <dimen name="profile_edit_image_layout_margin_start">0dp</dimen>
-  <dimen name="profile_name_text_view_layout_margin_end">0dp</dimen>
-  <dimen name="recently_played_stories_text_view_layout_margin_start">0dp</dimen>
-  <dimen name="view_all_text_view_margin_end">0dp</dimen>
-
   <!-- Ongoing Topic List Fragment -->
   <dimen name="ongoing_topic_list_fragment_padding_start">20dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_top">20dp</dimen>
@@ -589,6 +569,7 @@
   <dimen name="topic_revision_fragment_padding_top">20dp</dimen>
   <dimen name="topic_revision_fragment_padding_end">20dp</dimen>
   <dimen name="topic_revision_fragment_padding_bottom">144dp</dimen>
+
   <dimen name="topic_revision_summary_view_container_margin_start">8dp</dimen>
   <dimen name="topic_revision_summary_view_container_margin_top">12dp</dimen>
   <dimen name="topic_revision_summary_view_container_margin_end">8dp</dimen>
@@ -597,28 +578,27 @@
   <dimen name="topic_revision_summary_view_subtopic_title_text_view_padding_end">8dp</dimen>
 
   <!-- Solution Summary -->
-  <dimen name="solution_summary_margin_top_linear_layout_first">32dp</dimen>
-  <dimen name="solution_summary_margin_top_solution_title">12dp</dimen>
   <dimen name="solution_summary_margin_start">28dp</dimen>
   <dimen name="solution_summary_margin_end">28dp</dimen>
   <dimen name="solution_summary_margin_bottom">20dp</dimen>
+  <dimen name="solution_summary_margin_top_linear_layout">8dp</dimen>
+  <dimen name="solution_summary_margin_top_linear_layout_first">32dp</dimen>
+  <dimen name="solution_summary_margin_start_linear_layout">40dp</dimen>
+  <dimen name="solution_summary_margin_end_linear_layout">40dp</dimen>
+  <dimen name="solution_summary_margin_bottom_linear_layout">32dp</dimen>
+  <dimen name="solution_summary_margin_top_solution_summary_label">12dp</dimen>
   <dimen name="solution_summary_margin_bottom_solution_title">12dp</dimen>
+  <dimen name="solution_summary_margin_top_solution_title">12dp</dimen>
   <dimen name="solution_summary_margin_top_reveal_solution_button">28dp</dimen>
   <dimen name="solution_summary_margin_bottom_reveal_solution_button">32dp</dimen>
   <dimen name="solution_summary_margin_start_expand_list_icon">8dp</dimen>
+  <dimen name="solution_summary_margin_top_expand_list_icon">0dp</dimen>
   <dimen name="solution_summary_margin_end_expand_list_icon">8dp</dimen>
+  <dimen name="solution_summary_margin_bottom_expand_list_icon">8dp</dimen>
   <dimen name="solution_summary_min_width_expand_list_icon">48dp</dimen>
   <dimen name="solution_summary_min_height_expand_list_icon">48dp</dimen>
-  <dimen name="solution_summary_margin_top_expand_list_icon">0dp</dimen>
-  <dimen name="solution_summary_margin_start_linear_layout">40dp</dimen>
-  <dimen name="solution_summary_margin_end_linear_layout">40dp</dimen>
-  <dimen name="solution_summary_margin_top_linear_layout">8dp</dimen>
-  <dimen name="solution_summary_margin_bottom_linear_layout">32dp</dimen>
-  <dimen name="solution_summary_margin_bottom_expand_list_icon">8dp</dimen>
-  <dimen name="solution_summary_margin_top_solution_summary_label">12dp</dimen>
 
   <!-- Profile Reset Pin Activity -->
-  <dimen name="profile_reset_pin_activity_scroll_view_padding_bottom">0dp</dimen>
   <dimen name="profile_reset_pin_activity_constraint_layout_padding_bottom">32dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_pin_main_padding_start">28dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_pin_main_padding_end">28dp</dimen>
@@ -629,6 +609,7 @@
   <dimen name="profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_top">28dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_end">28dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_save_button_margin_end">28dp</dimen>
+  <dimen name="profile_reset_pin_activity_scroll_view_padding_bottom">0dp</dimen>
 
   <!-- Profile Rename Activity -->
   <dimen name="profile_rename_activity_constraint_layout">32dp</dimen>
@@ -679,11 +660,10 @@
 
   <!-- TopicPracticeHeader -->
   <dimen name="topic_practice_header_child_constraint_layout_margin_start">32dp</dimen>
-  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
   <dimen name="topic_practice_header_child_constraint_layout_margin_end">24dp</dimen>
-  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">24dp</dimen>
-  <dimen name="master_skills_text_view_margin_end">88dp</dimen>
   <dimen name="topic_practice_header_child_constraint_layout_width">0dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">24dp</dimen>
 
   <!-- ProfileProgressRecentlyPlayedStoryCard -->
   <dimen name="profile_progress_recently_played_story_card_layout_margin_start">8dp</dimen>
@@ -698,7 +678,7 @@
   <dimen name="hints_and_solution_summary_card_margin_start">16dp</dimen>
   <dimen name="hints_and_solution_summary_card_margin_end">16dp</dimen>
 
-  <!-- AdministratorControlDownloadPermissionsView -->
+  <!-- AdministratorControls-->
   <dimen name="administrator_controls_download_permissions_view_download_permissions_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_download_permissions_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_topic_update_on_wifi_constraint_layout_padding_start">16dp</dimen>
@@ -707,34 +687,24 @@
   <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>
-
-  <!-- AdministratorControlAccountActionsView -->
-  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_start">16dp</dimen>
-  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_end">16dp</dimen>
-  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_start">16dp</dimen>
-  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_end">16dp</dimen>
-
-  <!-- AdministratorControlsAppInformationView -->
   <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_end">16dp</dimen>
-
-  <!-- AdministratorControlsFragment -->
   <dimen name="administrator_controls_fragment_recycler_view_padding_bottom">80dp</dimen>
-
-  <!-- AdministratorControlsGeneralView -->
   <dimen name="administrator_controls_general_view_general_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_general_view_general_text_view_padding_top">20dp</dimen>
   <dimen name="administrator_controls_general_view_general_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_general_view_edit_account_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_general_view_edit_account_text_view_padding_end">16dp</dimen>
-
-  <!-- AdministratorControlsProfileView -->
   <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_end">16dp</dimen>
   <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_end">16dp</dimen>
 
   <!-- OptionAudioLanguage -->
   <dimen name="option_audio_language_padding_start">16dp</dimen>
@@ -770,10 +740,10 @@
   <dimen name="spotlight_done_button_corner_radius">4dp</dimen>
 
   <!-- Survey -->
+  <dimen name="survey_text_margin">28dp</dimen>
   <dimen name="survey_progress_text_margin_start">12dp</dimen>
   <dimen name="survey_progress_text_margin_end">20dp</dimen>
   <dimen name="survey_progress_bar_height">12dp</dimen>
-  <dimen name="survey_text_margin">28dp</dimen>
   <dimen name="survey_question_text_margin">28dp</dimen>
   <dimen name="survey_question_recycler_view_margin">28dp</dimen>
   <dimen name="survey_navigation_buttons_margin">28dp</dimen>