diff --git a/app/src/main/res/drawable/ic_onboarding_bottom_toolbar.xml b/app/src/main/res/drawable/ic_onboarding_bottom_toolbar.xml
new file mode 100644
index 000000000..55255bd21
--- /dev/null
+++ b/app/src/main/res/drawable/ic_onboarding_bottom_toolbar.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/. -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/onboarding_toolbar_bottom"
+        android:autoMirrored="true">
+</bitmap>
diff --git a/app/src/main/res/drawable/ic_onboarding_top_toolbar.xml b/app/src/main/res/drawable/ic_onboarding_top_toolbar.xml
new file mode 100644
index 000000000..bfeb02248
--- /dev/null
+++ b/app/src/main/res/drawable/ic_onboarding_top_toolbar.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/. -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/onboarding_toolbar_top"
+        android:autoMirrored="true">
+</bitmap>
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 04e9334d9..7cd4ad9be 100644
--- a/app/src/main/res/layout/onboarding_toolbar_position_picker.xml
+++ b/app/src/main/res/layout/onboarding_toolbar_position_picker.xml
@@ -54,11 +54,10 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/preference_top_toolbar"
         android:elevation="1dp"
-        app:layout_constraintBottom_toBottomOf="@+id/toolbar_top_image"
-        app:layout_constraintCircle="@id/toolbar_top_image"
-        app:layout_constraintCircleAngle="298"
-        app:layout_constraintCircleRadius="66dp"
-        app:layout_constraintStart_toStartOf="parent"
+        android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
+        android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
+        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" />
 
@@ -68,7 +67,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:background="@drawable/onboarding_toolbar_top"
+        android:background="@drawable/ic_onboarding_top_toolbar"
         android:contentDescription="@string/preference_top_toolbar"
         android:foreground="@drawable/rounded_ripple"
         app:layout_constraintEnd_toStartOf="@+id/toolbar_bottom_image"
@@ -82,11 +81,10 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/preference_bottom_toolbar"
         android:elevation="1dp"
-        app:layout_constraintBottom_toBottomOf="@+id/toolbar_bottom_image"
-        app:layout_constraintCircle="@id/toolbar_bottom_image"
-        app:layout_constraintCircleAngle="298"
-        app:layout_constraintCircleRadius="66dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
+        android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
+        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" />
 
@@ -97,7 +95,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/onboarding_toolbar_bottom"
+        android:background="@drawable/ic_onboarding_bottom_toolbar"
         android:contentDescription="@string/preference_bottom_toolbar"
         android:foreground="@drawable/rounded_ripple"
         app:layout_constraintEnd_toEndOf="parent"