diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_bottom.png
new file mode 100644
index 000000000..3e943d24c
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_top.png
new file mode 100644
index 000000000..8d510326a
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_bottom.png
new file mode 100644
index 000000000..c3aeaa711
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_top.png
new file mode 100644
index 000000000..ddb085028
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_bottom.png
new file mode 100644
index 000000000..163ad40a5
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_top.png
new file mode 100644
index 000000000..3fd8ff5ee
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_bottom.png
new file mode 100644
index 000000000..d3fad41eb
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_top.png
new file mode 100644
index 000000000..90fe486b0
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_bottom.png
new file mode 100644
index 000000000..03c924a97
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_top.png
new file mode 100644
index 000000000..a30e91dee
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/layout/onboarding_toolbar_position_picker.xml b/app/src/main/res/layout/onboarding_toolbar_position_picker.xml
index d828695f6..c20c36274 100644
--- a/app/src/main/res/layout/onboarding_toolbar_position_picker.xml
+++ b/app/src/main/res/layout/onboarding_toolbar_position_picker.xml
@@ -56,7 +56,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/toolbar_top_image"
+        app:layout_constraintStart_toStartOf="@+id/toolbar_top_image"
         app:layout_constraintTop_toTopOf="@+id/toolbar_top_image"
         app:layout_constraintTop_toBottomOf="@+id/description_text"
         app:onboardingKey="@string/pref_key_toolbar_top" />
@@ -83,7 +83,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/toolbar_bottom_image"
+        app:layout_constraintStart_toStartOf="@+id/toolbar_bottom_image"
         app:layout_constraintTop_toTopOf="@+id/toolbar_bottom_image"
         app:layout_constraintTop_toBottomOf="@+id/description_text"
         app:onboardingKey="@string/pref_key_toolbar_bottom" />