diff --git a/app/src/main/res/drawable/onboarding_card_background_dark.xml b/app/src/main/res/drawable/onboarding_card_background_dark.xml
index a6f8a1ed7..92284bc47 100644
--- a/app/src/main/res/drawable/onboarding_card_background_dark.xml
+++ b/app/src/main/res/drawable/onboarding_card_background_dark.xml
@@ -9,7 +9,7 @@
         android:color="?neutralFaded" />
     <gradient
         android:angle="45"
-        android:endColor="@color/accent_high_contrast_dark_theme"
-        android:startColor="@color/accent_bright_dark_theme" />
+        android:endColor="?onboardingDarkGradientEndBackground"
+        android:startColor="?onboardingDarkGradientStartBackground" />
     <corners android:radius="8dp" />
 </shape>
diff --git a/app/src/main/res/drawable/onboarding_card_background_light.xml b/app/src/main/res/drawable/onboarding_card_background_light.xml
index 80b7bf978..fca260d26 100644
--- a/app/src/main/res/drawable/onboarding_card_background_light.xml
+++ b/app/src/main/res/drawable/onboarding_card_background_light.xml
@@ -5,6 +5,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <stroke android:width="1dp" android:color="?neutralFaded" />
-    <solid android:color="?inset" />
+    <solid android:color="?above" />
     <corners android:radius="8dp" />
 </shape>
diff --git a/app/src/main/res/drawable/onboarding_rounded_bottom_corners_ripple.xml b/app/src/main/res/drawable/onboarding_rounded_bottom_corners_ripple.xml
index 9d7f6a466..c9b9525a4 100644
--- a/app/src/main/res/drawable/onboarding_rounded_bottom_corners_ripple.xml
+++ b/app/src/main/res/drawable/onboarding_rounded_bottom_corners_ripple.xml
@@ -17,7 +17,7 @@
             <stroke
                 android:width="1dp"
                 android:color="?neutralFaded" />
-            <solid android:color="?inset" />
+            <solid android:color="?above" />
             <corners
                 android:bottomLeftRadius="@dimen/tab_corner_radius"
                 android:bottomRightRadius="@dimen/tab_corner_radius" />
diff --git a/app/src/main/res/layout/onboarding_finish.xml b/app/src/main/res/layout/onboarding_finish.xml
index 743ec0e39..0560ec0a8 100644
--- a/app/src/main/res/layout/onboarding_finish.xml
+++ b/app/src/main/res/layout/onboarding_finish.xml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/PositiveButton"
+    style="@style/FinishOnboardingButton"
     android:id="@+id/finish_button"
     android:layout_marginBottom="16dp"
     android:text="@string/onboarding_finish" />
diff --git a/app/src/main/res/layout/onboarding_privacy_notice.xml b/app/src/main/res/layout/onboarding_privacy_notice.xml
index fd5ff4179..7e4321895 100644
--- a/app/src/main/res/layout/onboarding_privacy_notice.xml
+++ b/app/src/main/res/layout/onboarding_privacy_notice.xml
@@ -7,7 +7,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/onboarding_card"
-        style="@style/OnboardingCardLight"
+        style="@style/OnboardingCardLightWithPadding"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
     <TextView
diff --git a/app/src/main/res/layout/onboarding_private_browsing.xml b/app/src/main/res/layout/onboarding_private_browsing.xml
index 7ead36e55..6adfa146e 100644
--- a/app/src/main/res/layout/onboarding_private_browsing.xml
+++ b/app/src/main/res/layout/onboarding_private_browsing.xml
@@ -7,7 +7,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/onboarding_card"
-        style="@style/OnboardingCardLight"
+        style="@style/OnboardingCardLightWithPadding"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
     <TextView
diff --git a/app/src/main/res/layout/onboarding_tracking_protection.xml b/app/src/main/res/layout/onboarding_tracking_protection.xml
index 36b4d22d7..9ad392e18 100644
--- a/app/src/main/res/layout/onboarding_tracking_protection.xml
+++ b/app/src/main/res/layout/onboarding_tracking_protection.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/onboarding_card"
-    style="@style/OnboardingCardLight"
+    style="@style/OnboardingCardLightWithPadding"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -29,6 +29,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="@id/header_text"
         app:layout_constraintEnd_toEndOf="parent"
+        android:theme="@style/Switch.Colored"
         app:layout_constraintTop_toTopOf="@id/header_text" />
 
     <TextView
@@ -63,6 +64,7 @@
         android:paddingEnd="8dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/description_text"
+        android:buttonTint="@color/onboarding_radio_button_color"
         app:onboardingKey="@string/pref_key_tracking_protection_standard_option" />
 
     <TextView
@@ -109,6 +111,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tracking_protection_standard_option"
+        android:buttonTint="@color/onboarding_radio_button_color"
         app:onboardingKey="@string/pref_key_tracking_protection_strict_default" />
 
     <TextView
diff --git a/app/src/main/res/layout/onboarding_whats_new.xml b/app/src/main/res/layout/onboarding_whats_new.xml
index 000be63e1..19aeb0f7c 100644
--- a/app/src/main/res/layout/onboarding_whats_new.xml
+++ b/app/src/main/res/layout/onboarding_whats_new.xml
@@ -7,7 +7,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/onboarding_card"
-        style="@style/OnboardingCardLight"
+        style="@style/OnboardingCardLightWithPadding"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
     <TextView