diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_dark_theme.png
new file mode 100644
index 0000000000..dce01c443d
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_light_theme.png
new file mode 100644
index 0000000000..7fb5ce3bfd
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_dark_theme.png
new file mode 100644
index 0000000000..1385eee635
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_light_theme.png
new file mode 100644
index 0000000000..4f3f45a1c1
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_dark_theme.png
new file mode 100644
index 0000000000..105da2ce1b
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_light_theme.png
new file mode 100644
index 0000000000..7f12a7559f
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_dark_theme.png
new file mode 100644
index 0000000000..9dced76986
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_light_theme.png
new file mode 100644
index 0000000000..8113dc70d2
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_dark_theme.png
new file mode 100644
index 0000000000..d41178b244
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_light_theme.png
new file mode 100644
index 0000000000..65c91ec286
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/layout/onboarding_theme_picker.xml b/app/src/main/res/layout/onboarding_theme_picker.xml
index d88233916c..05cb909396 100644
--- a/app/src/main/res/layout/onboarding_theme_picker.xml
+++ b/app/src/main/res/layout/onboarding_theme_picker.xml
@@ -54,7 +54,7 @@
         android:elevation="1dp"
         android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
         android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
-        app:layout_constraintLeft_toLeftOf="@+id/theme_light_image"
+        app:layout_constraintStart_toStartOf="@+id/theme_light_image"
         app:layout_constraintTop_toTopOf="@+id/theme_light_image"
         app:onboardingKey="@string/pref_key_light_theme" />
 
@@ -80,7 +80,7 @@
         android:elevation="1dp"
         android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
         android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
-        app:layout_constraintLeft_toLeftOf="@+id/theme_dark_image"
+        app:layout_constraintStart_toStartOf="@+id/theme_dark_image"
         app:layout_constraintTop_toTopOf="@+id/theme_dark_image"
         app:onboardingKey="@string/pref_key_dark_theme" />
 
diff --git a/app/src/main/res/values-ldrtl/dimens.xml b/app/src/main/res/values-ldrtl/dimens.xml
new file mode 100644
index 0000000000..1d4fc34d0d
--- /dev/null
+++ b/app/src/main/res/values-ldrtl/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+<resources>
+    <!--  Onboarding  -->
+    <dimen name="onboarding_dual_pane_radio_button_translation_x">7dp</dimen>
+</resources>