diff --git a/java/res/layout/setup_steps_cards.xml b/java/res/layout/setup_steps_cards.xml
index 245173122..9b03a3e93 100644
--- a/java/res/layout/setup_steps_cards.xml
+++ b/java/res/layout/setup_steps_cards.xml
@@ -23,7 +23,7 @@
         android:id="@+id/setup_step_bullets"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/setup_step_vertical_padding"
+        android:paddingTop="@dimen/setup_step_vertical_padding"
         android:orientation="horizontal">
         <TextView
             android:id="@+id/setup_step1_bullet"
diff --git a/java/res/layout/setup_welcome_title.xml b/java/res/layout/setup_welcome_title.xml
index 6e6d78147..af7053a37 100644
--- a/java/res/layout/setup_welcome_title.xml
+++ b/java/res/layout/setup_welcome_title.xml
@@ -27,6 +27,6 @@
     <TextView
         android:id="@+id/setup_welcome_description"
         android:text="@string/setup_welcome_additional_description"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/setup_welcome_description_top_margin"
         style="@style/setupWelcomeDescritpionStyle" />
 </merge>
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index a2e1d212b..751773211 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -23,8 +23,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/setup_welcome_video_vertical_margin"
-        android:paddingBottom="@dimen/setup_welcome_video_vertical_margin">
+        android:paddingTop="@dimen/setup_welcome_video_top_padding"
+        android:paddingBottom="@dimen/setup_welcome_video_bottom_padding">
         <LinearLayout
             android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
             android:layout_width="0dp"
diff --git a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
index d1df81e01..bc7928d6a 100644
--- a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
+++ b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Setup wizard dimensions for large-tablet/portrait. -->
     <dimen name="setup_title_text_size">72sp</dimen>
-    <dimen name="setup_welcome_description_text_size">36sp</dimen>
+    <dimen name="setup_welcome_description_text_size">38sp</dimen>
     <dimen name="setup_step_bullet_text_size">24sp</dimen>
     <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
     <dimen name="setup_step_indicator_height">24dp</dimen>
@@ -34,7 +34,9 @@
     <integer name="setup_title_weight_in_screen">40</integer>
     <integer name="setup_body_weight_in_screen">60</integer>
     <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">24dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
     <integer name="setup_welcome_video_weight_in_screen">70</integer>
     <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
 </resources>
diff --git a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
index babc05bf2..aebf6d2f3 100644
--- a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
+++ b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
@@ -16,13 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Setup wizard dimensions for large-phone/landscape. -->
-    <dimen name="setup_title_text_size">42sp</dimen>
-    <dimen name="setup_welcome_description_text_size">24sp</dimen>
+    <dimen name="setup_title_text_size">40sp</dimen>
+    <dimen name="setup_welcome_description_text_size">22sp</dimen>
     <dimen name="setup_step_bullet_text_size">22sp</dimen>
     <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
     <dimen name="setup_step_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">22sp</dimen>
-    <dimen name="setup_step_instruction_text_size">14sp</dimen>
+    <dimen name="setup_step_title_text_size">20sp</dimen>
+    <dimen name="setup_step_instruction_text_size">16sp</dimen>
     <dimen name="setup_step_action_text_size">18sp</dimen>
     <dimen name="setup_vertical_padding">16dp</dimen>
     <dimen name="setup_horizontal_padding">16dp</dimen>
@@ -34,7 +34,9 @@
     <integer name="setup_title_weight_in_screen">40</integer>
     <integer name="setup_body_weight_in_screen">60</integer>
     <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+    <dimen name="setup_welcome_description_top_margin">10dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
     <integer name="setup_welcome_video_weight_in_screen">70</integer>
     <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
 </resources>
diff --git a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
index 772587491..aedf79fb2 100644
--- a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
+++ b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Setup wizard dimensions for small-tablet/landscape. -->
-    <dimen name="setup_title_text_size">56sp</dimen>
-    <dimen name="setup_welcome_description_text_size">28sp</dimen>
+    <dimen name="setup_title_text_size">60sp</dimen>
+    <dimen name="setup_welcome_description_text_size">32sp</dimen>
     <dimen name="setup_step_bullet_text_size">24sp</dimen>
     <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
     <dimen name="setup_step_indicator_height">24dp</dimen>
@@ -31,10 +31,12 @@
     <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
     <dimen name="setup_step_vertical_padding">16dp</dimen>
     <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
+    <integer name="setup_title_weight_in_screen">50</integer>
+    <integer name="setup_body_weight_in_screen">50</integer>
     <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">60</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer>
+    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
+    <integer name="setup_welcome_video_weight_in_screen">80</integer>
+    <integer name="setup_welcome_video_end_padding_weight_in_screen">20</integer>
 </resources>
diff --git a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
index 42d2284f5..6d66f46eb 100644
--- a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
+++ b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
@@ -16,15 +16,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Setup wizard dimensions for large-phone/portrait. -->
-    <dimen name="setup_title_text_size">46sp</dimen>
+    <dimen name="setup_title_text_size">48sp</dimen>
     <dimen name="setup_welcome_description_text_size">26sp</dimen>
     <dimen name="setup_step_bullet_text_size">22sp</dimen>
     <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
     <dimen name="setup_step_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">22sp</dimen>
-    <dimen name="setup_step_instruction_text_size">14sp</dimen>
+    <dimen name="setup_step_title_text_size">20sp</dimen>
+    <dimen name="setup_step_instruction_text_size">16sp</dimen>
     <dimen name="setup_step_action_text_size">18sp</dimen>
-    <dimen name="setup_vertical_padding">16dp</dimen>
+    <dimen name="setup_vertical_padding">8dp</dimen>
     <dimen name="setup_horizontal_padding">16dp</dimen>
     <dimen name="setup_step_action_height">48dp</dimen>
     <dimen name="setup_step_horizontal_padding">24dp</dimen>
@@ -34,7 +34,9 @@
     <integer name="setup_title_weight_in_screen">40</integer>
     <integer name="setup_body_weight_in_screen">60</integer>
     <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+    <dimen name="setup_welcome_description_top_margin">6dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">12dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
     <integer name="setup_welcome_video_weight_in_screen">70</integer>
     <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
 </resources>
diff --git a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
index b5f0e5cea..e22b741fb 100644
--- a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
+++ b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Setup wizard dimensions for large-tablet/landscape. -->
-    <dimen name="setup_title_text_size">58sp</dimen>
-    <dimen name="setup_welcome_description_text_size">28sp</dimen>
+    <dimen name="setup_title_text_size">72sp</dimen>
+    <dimen name="setup_welcome_description_text_size">38sp</dimen>
     <dimen name="setup_step_bullet_text_size">24sp</dimen>
     <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
     <dimen name="setup_step_indicator_height">24dp</dimen>
@@ -25,16 +25,18 @@
     <dimen name="setup_step_instruction_text_size">18sp</dimen>
     <dimen name="setup_step_action_text_size">20sp</dimen>
     <dimen name="setup_vertical_padding">96dp</dimen>
-    <dimen name="setup_horizontal_padding">192dp</dimen>
+    <dimen name="setup_horizontal_padding">160dp</dimen>
     <dimen name="setup_step_action_height">48dp</dimen>
     <dimen name="setup_step_horizontal_padding">24dp</dimen>
     <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
     <dimen name="setup_step_vertical_padding">16dp</dimen>
     <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
+    <integer name="setup_title_weight_in_screen">50</integer>
+    <integer name="setup_body_weight_in_screen">50</integer>
     <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">70</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
+    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
+    <integer name="setup_welcome_video_weight_in_screen">80</integer>
+    <integer name="setup_welcome_video_end_padding_weight_in_screen">20</integer>
 </resources>
diff --git a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
index 770b4e825..86cf3a04a 100644
--- a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
+++ b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
@@ -34,7 +34,9 @@
     <integer name="setup_title_weight_in_screen">40</integer>
     <integer name="setup_body_weight_in_screen">60</integer>
     <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">60</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer>
+    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">24dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
+    <integer name="setup_welcome_video_weight_in_screen">70</integer>
+    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
 </resources>
diff --git a/java/res/values-land/setup-dimens-small-phone-land.xml b/java/res/values-land/setup-dimens-small-phone-land.xml
index e6dbaa71c..088e6562a 100644
--- a/java/res/values-land/setup-dimens-small-phone-land.xml
+++ b/java/res/values-land/setup-dimens-small-phone-land.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Setup wizard dimensions for small-phone/landscape. -->
-    <dimen name="setup_title_text_size">36sp</dimen>
+    <dimen name="setup_title_text_size">32sp</dimen>
     <dimen name="setup_welcome_description_text_size">18sp</dimen>
     <dimen name="setup_step_bullet_text_size">18sp</dimen>
     <dimen name="setup_step_triangle_indicator_height">18dp</dimen>
@@ -24,7 +24,7 @@
     <dimen name="setup_step_title_text_size">18sp</dimen>
     <dimen name="setup_step_instruction_text_size">14sp</dimen>
     <dimen name="setup_step_action_text_size">16sp</dimen>
-    <dimen name="setup_vertical_padding">12dp</dimen>
+    <dimen name="setup_vertical_padding">16dp</dimen>
     <dimen name="setup_horizontal_padding">12dp</dimen>
     <dimen name="setup_step_action_height">42dp</dimen>
     <dimen name="setup_step_horizontal_padding">20dp</dimen>
@@ -34,7 +34,9 @@
     <integer name="setup_title_weight_in_screen">40</integer>
     <integer name="setup_body_weight_in_screen">60</integer>
     <dimen name="setup_title_end_margin">12dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">12dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">60</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer>
+    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
+    <integer name="setup_welcome_video_weight_in_screen">70</integer>
+    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
 </resources>
diff --git a/java/res/values-port/setup-dimens-small-phone-port.xml b/java/res/values-port/setup-dimens-small-phone-port.xml
index a3b18afbc..8ac72ea7c 100644
--- a/java/res/values-port/setup-dimens-small-phone-port.xml
+++ b/java/res/values-port/setup-dimens-small-phone-port.xml
@@ -24,7 +24,7 @@
     <dimen name="setup_step_title_text_size">18sp</dimen>
     <dimen name="setup_step_instruction_text_size">14sp</dimen>
     <dimen name="setup_step_action_text_size">16sp</dimen>
-    <dimen name="setup_vertical_padding">12dp</dimen>
+    <dimen name="setup_vertical_padding">2dp</dimen>
     <dimen name="setup_horizontal_padding">12dp</dimen>
     <dimen name="setup_step_action_height">42dp</dimen>
     <dimen name="setup_step_horizontal_padding">20dp</dimen>
@@ -34,7 +34,9 @@
     <integer name="setup_title_weight_in_screen">40</integer>
     <integer name="setup_body_weight_in_screen">60</integer>
     <dimen name="setup_title_end_margin">16dp</dimen>
-    <dimen name="setup_welcome_video_vertical_margin">16dp</dimen>
+    <dimen name="setup_welcome_description_top_margin">4dp</dimen>
+    <dimen name="setup_welcome_video_top_padding">12dp</dimen>
+    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
     <integer name="setup_welcome_video_weight_in_screen">70</integer>
     <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
 </resources>