diff --git a/app/src/main/res/drawable/ic_onboarding_bottom_toolbar.xml b/app/src/main/res/drawable/ic_onboarding_bottom_toolbar.xml
deleted file mode 100644
index 55255bd21..000000000
--- a/app/src/main/res/drawable/ic_onboarding_bottom_toolbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
deleted file mode 100644
index bfeb02248..000000000
--- a/app/src/main/res/drawable/ic_onboarding_top_toolbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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 7cd4ad9be..d828695f6 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_constraintStart_toStartOf="@+id/toolbar_top_image"
+        app:layout_constraintLeft_toLeftOf="@+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" />
@@ -67,7 +67,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:background="@drawable/ic_onboarding_top_toolbar"
+        android:background="@drawable/onboarding_toolbar_top"
         android:contentDescription="@string/preference_top_toolbar"
         android:foreground="@drawable/rounded_ripple"
         app:layout_constraintEnd_toStartOf="@+id/toolbar_bottom_image"
@@ -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_constraintStart_toStartOf="@+id/toolbar_bottom_image"
+        app:layout_constraintLeft_toLeftOf="@+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" />
@@ -95,7 +95,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/ic_onboarding_bottom_toolbar"
+        android:background="@drawable/onboarding_toolbar_bottom"
         android:contentDescription="@string/preference_bottom_toolbar"
         android:foreground="@drawable/rounded_ripple"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-ldrtl/dimens.xml b/app/src/main/res/values-ldrtl/dimens.xml
deleted file mode 100644
index 1d4fc34d0..000000000
--- a/app/src/main/res/values-ldrtl/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>