diff --git a/app/src/main/res/drawable/ic_onboarding_dark_theme.xml b/app/src/main/res/drawable/ic_onboarding_dark_theme.xml
deleted file mode 100644
index b6d4dbc51..000000000
--- a/app/src/main/res/drawable/ic_onboarding_dark_theme.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_onboarding_light_theme.xml b/app/src/main/res/drawable/ic_onboarding_light_theme.xml
deleted file mode 100644
index 2bc8350aa..000000000
--- a/app/src/main/res/drawable/ic_onboarding_light_theme.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/layout/onboarding_theme_picker.xml b/app/src/main/res/layout/onboarding_theme_picker.xml
index 322cfe9c5..d88233916 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_constraintStart_toStartOf="@+id/theme_light_image"
+ app:layout_constraintLeft_toLeftOf="@+id/theme_light_image"
app:layout_constraintTop_toTopOf="@+id/theme_light_image"
app:onboardingKey="@string/pref_key_light_theme" />
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
- android:background="@drawable/ic_onboarding_light_theme"
+ android:background="@drawable/onboarding_light_theme"
android:contentDescription="@string/onboarding_theme_light_title"
android:foreground="@drawable/rounded_ripple"
app:layout_constraintEnd_toStartOf="@+id/theme_dark_image"
@@ -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_constraintStart_toStartOf="@+id/theme_dark_image"
+ app:layout_constraintLeft_toLeftOf="@+id/theme_dark_image"
app:layout_constraintTop_toTopOf="@+id/theme_dark_image"
app:onboardingKey="@string/pref_key_dark_theme" />
@@ -91,7 +91,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
- android:background="@drawable/ic_onboarding_dark_theme"
+ android:background="@drawable/onboarding_dark_theme"
android:contentDescription="@string/onboarding_theme_dark_title"
android:foreground="@drawable/rounded_ripple"
app:layout_constraintEnd_toEndOf="parent"