diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
index 7f74018ca..11f98a3a3 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
@@ -5,7 +5,7 @@
package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
import android.view.View
-import android.widget.Switch
+import androidx.appcompat.widget.SwitchCompat
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.onboarding_tracking_protection.view.*
import org.mozilla.fenix.R
@@ -17,7 +17,7 @@ class OnboardingTrackingProtectionViewHolder(view: View) : RecyclerView.ViewHold
private var standardTrackingProtection: OnboardingRadioButton
private var strictTrackingProtection: OnboardingRadioButton
- private var trackingProtectionToggle: Switch
+ private var trackingProtectionToggle: SwitchCompat
init {
view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_tracking_protection)
diff --git a/app/src/main/res/drawable/onboarding_padded_background.xml b/app/src/main/res/drawable/onboarding_padded_background.xml
new file mode 100644
index 000000000..f0b944c9f
--- /dev/null
+++ b/app/src/main/res/drawable/onboarding_padded_background.xml
@@ -0,0 +1,13 @@
+
+
+ -
+
+
+
+
+
diff --git a/app/src/main/res/layout/onboarding_finish.xml b/app/src/main/res/layout/onboarding_finish.xml
index 16601fa54..05d029aec 100644
--- a/app/src/main/res/layout/onboarding_finish.xml
+++ b/app/src/main/res/layout/onboarding_finish.xml
@@ -4,7 +4,8 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/app/src/main/res/layout/onboarding_manual_signin.xml b/app/src/main/res/layout/onboarding_manual_signin.xml
index c4b9d0ff0..b563a147b 100644
--- a/app/src/main/res/layout/onboarding_manual_signin.xml
+++ b/app/src/main/res/layout/onboarding_manual_signin.xml
@@ -25,8 +25,8 @@
diff --git a/app/src/main/res/layout/onboarding_privacy_notice.xml b/app/src/main/res/layout/onboarding_privacy_notice.xml
index 7e4321895..1fbb0abd4 100644
--- a/app/src/main/res/layout/onboarding_privacy_notice.xml
+++ b/app/src/main/res/layout/onboarding_privacy_notice.xml
@@ -38,7 +38,7 @@
style="@style/NeutralOnboardingButton"
android:id="@+id/read_button"
android:text="@string/onboarding_privacy_notice_read_button"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="10dp"
app:layout_constraintTop_toBottomOf="@id/description_text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/onboarding_tracking_protection.xml b/app/src/main/res/layout/onboarding_tracking_protection.xml
index 5bdacb8ce..5f96d4fe8 100644
--- a/app/src/main/res/layout/onboarding_tracking_protection.xml
+++ b/app/src/main/res/layout/onboarding_tracking_protection.xml
@@ -23,10 +23,12 @@
app:layout_constraintTop_toTopOf="parent"
tools:drawableStart="@drawable/ic_onboarding_tracking_protection" />
-
-
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/onboarding_card"
+ style="@style/OnboardingCardLight"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:paddingTop="16dp"
+ android:paddingBottom="10dp">
+ android:id="@+id/header_text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:drawablePadding="12dp"
+ android:gravity="center_vertical"
+ android:text="@string/onboarding_whats_new_header1"
+ android:textAppearance="@style/HeaderTextStyle"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:drawableStart="@drawable/ic_whats_new" />
+
+ android:id="@+id/description_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:textAppearance="@style/Body14TextStyle"
+ app:layout_constraintBottom_toTopOf="@id/get_answers"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/header_text"
+ tools:text="@string/onboarding_whats_new_description" />
+
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e54eb036a..9fa1f0417 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -248,8 +248,8 @@