diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java
index 96dbf5af2..0f88a3cd5 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java
@@ -9,7 +9,10 @@ package org.dslul.openboard.inputmethod.latin.setup;
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
@@ -22,6 +25,8 @@ import android.widget.TextView;
 import android.widget.VideoView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 
 import org.dslul.openboard.inputmethod.latin.R;
 import org.dslul.openboard.inputmethod.latin.settings.SettingsActivity;
@@ -141,7 +146,7 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         final SetupStep step1 = new SetupStep(STEP_1, applicationName,
                 mStep1Bullet, findViewById(R.id.setup_step1),
                 R.string.setup_step1_title, R.string.setup_step1_instruction,
-                R.string.setup_step1_finished_instruction, R.drawable.ic_setup_step1,
+                R.string.setup_step1_finished_instruction, R.drawable.ic_setup_key,
                 R.string.setup_step1_action);
         final SettingsPoolingHandler handler = mHandler;
         step1.setAction(() -> {
@@ -153,7 +158,7 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         final SetupStep step2 = new SetupStep(STEP_2, applicationName,
                 (TextView)findViewById(R.id.setup_step2_bullet), findViewById(R.id.setup_step2),
                 R.string.setup_step2_title, R.string.setup_step2_instruction,
-                0 /* finishedInstruction */, R.drawable.ic_setup_step2,
+                0 /* finishedInstruction */, R.drawable.ic_setup_select,
                 R.string.setup_step2_action);
         step2.setAction(this::invokeInputMethodPicker);
         mSetupStepGroup.addStep(step2);
@@ -161,7 +166,7 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         final SetupStep step3 = new SetupStep(STEP_3, applicationName,
                 (TextView)findViewById(R.id.setup_step3_bullet), findViewById(R.id.setup_step3),
                 R.string.setup_step3_title, R.string.setup_step3_instruction,
-                0 /* finishedInstruction */, R.drawable.ic_setup_step3,
+                0 /* finishedInstruction */, R.drawable.ic_setup_earth,
                 R.string.setup_step3_action);
         step3.setAction(() -> {
             final Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
@@ -196,8 +201,10 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         mActionNext = findViewById(R.id.setup_next);
         mActionNext.setOnClickListener(this);
         mActionFinish = findViewById(R.id.setup_finish);
-        mActionFinish.setCompoundDrawablesRelativeWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_setup_finish),
-                                                        null, null, null);
+        final Drawable finishDrawable = ContextCompat.getDrawable(this, R.drawable.ic_setup_check);
+        DrawableCompat.setTintList(finishDrawable, new ColorStateList(new int[][]{{android.R.attr.state_focused}, {android.R.attr.state_pressed}, {}},
+                new int[]{Color.WHITE, Color.WHITE, step1.mActivatedColor}));
+        mActionFinish.setCompoundDrawablesRelativeWithIntrinsicBounds(finishDrawable, null, null, null);
         mActionFinish.setOnClickListener(this);
     }
 
@@ -420,12 +427,15 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
 
             mActionLabel = mStepView.findViewById(R.id.setup_step_action_label);
             mActionLabel.setText(res.getString(actionLabel));
+            final Drawable actionIconDrawable = res.getDrawable(actionIcon);
+            DrawableCompat.setTintList(actionIconDrawable, new ColorStateList(new int[][]{{android.R.attr.state_focused}, {android.R.attr.state_pressed}, {}},
+                    new int[]{Color.WHITE, Color.WHITE, this.mActivatedColor}));
             if (actionIcon == 0) {
                 final int paddingEnd = mActionLabel.getPaddingEnd();
                 mActionLabel.setPaddingRelative(paddingEnd, 0, paddingEnd, 0);
             } else {
                 mActionLabel.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                        res.getDrawable(actionIcon), null, null, null);
+                        actionIconDrawable, null, null, null);
             }
         }
 
diff --git a/app/src/main/res/drawable-hdpi/unbundled_check_01.webp b/app/src/main/res/drawable-hdpi/unbundled_check_01.webp
deleted file mode 100644
index 5af9bedda..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_check_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/unbundled_earth_01.webp b/app/src/main/res/drawable-hdpi/unbundled_earth_01.webp
deleted file mode 100644
index ab1a46353..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_earth_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/unbundled_key_01.webp b/app/src/main/res/drawable-hdpi/unbundled_key_01.webp
deleted file mode 100644
index b7b29ad9e..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_key_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/unbundled_select_01.webp b/app/src/main/res/drawable-hdpi/unbundled_select_01.webp
deleted file mode 100644
index 6015940bd..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_select_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_check_01.webp b/app/src/main/res/drawable-mdpi/unbundled_check_01.webp
deleted file mode 100644
index 7d2d26bd3..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_check_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_earth_01.webp b/app/src/main/res/drawable-mdpi/unbundled_earth_01.webp
deleted file mode 100644
index 225f63276..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_earth_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_key_01.webp b/app/src/main/res/drawable-mdpi/unbundled_key_01.webp
deleted file mode 100644
index b61e6a8c6..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_key_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_select_01.webp b/app/src/main/res/drawable-mdpi/unbundled_select_01.webp
deleted file mode 100644
index b3ecc5090..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_select_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_check_01.webp b/app/src/main/res/drawable-xhdpi/unbundled_check_01.webp
deleted file mode 100644
index 4d28469d8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_check_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_earth_01.webp b/app/src/main/res/drawable-xhdpi/unbundled_earth_01.webp
deleted file mode 100644
index e687dbf83..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_earth_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_key_01.webp b/app/src/main/res/drawable-xhdpi/unbundled_key_01.webp
deleted file mode 100644
index 77a76c0b0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_key_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_select_01.webp b/app/src/main/res/drawable-xhdpi/unbundled_select_01.webp
deleted file mode 100644
index ecaac69af..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_select_01.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_setup_check.xml b/app/src/main/res/drawable/ic_setup_check.xml
new file mode 100644
index 000000000..02fadcbf9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_setup_check.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_setup_earth.xml b/app/src/main/res/drawable/ic_setup_earth.xml
new file mode 100644
index 000000000..308987ae6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_setup_earth.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="288"
+    android:viewportWidth="288">
+    <path android:fillColor="#FFF"
+        android:pathData="M133,23.1c-10.6,1.2 -18.8,2.7 -20.1,3.5 -0.7,0.4 -2.9,1.1 -4.8,1.5 -6.6,1.3 -20.6,7.4 -27.6,11.9 -1.6,1.1 -3.7,2.3 -4.5,2.7 -7.9,3.6 -31.7,27.4 -35.3,35.3 -0.4,0.8 -1.6,2.8 -2.7,4.5 -6.4,10 -13.1,27.5 -15,39.5 -3.1,19.4 -3.2,27.2 -0.1,45.5 2.1,12.7 8.7,30 15.1,40 1.1,1.6 2.3,3.7 2.7,4.5 3.6,7.9 27.4,31.7 35.3,35.3 0.8,0.4 2.9,1.6 4.5,2.7 10.3,6.6 26.9,12.9 40,15 19.2,3.2 25.8,3.2 45,-0 13.1,-2.2 30,-8.5 40,-15 1.7,-1.1 3.7,-2.3 4.5,-2.7 7.9,-3.6 31.7,-27.4 35.3,-35.3 0.4,-0.8 1.6,-2.9 2.7,-4.5 11.8,-18.4 19.5,-50.3 17,-70.8 -1.9,-15.8 -3.5,-23.7 -7.1,-33.7 -1.6,-4.5 -7.5,-16.6 -10,-20.5 -1,-1.7 -2.2,-3.7 -2.6,-4.5 -3.6,-7.9 -27.4,-31.7 -35.3,-35.3 -0.8,-0.4 -2.8,-1.6 -4.5,-2.7 -4.3,-2.8 -16.9,-9 -18.2,-9 -0.6,-0 -2.4,-0.6 -4,-1.4 -5.1,-2.6 -14.8,-4.6 -31.3,-6.6 -8.5,-1 -10,-1 -19,0.1zM168.8,38.6c13.6,3.9 14.6,5 11.8,11.6 -0.8,1.8 -2.2,5.3 -3.2,7.8 -2,5.1 -3.3,6.5 -12.1,13.7 -3.4,2.9 -8,6.8 -10.2,8.8 -2.1,2 -5.4,4.7 -7.2,6.1l-3.3,2.4 -2.1,-2c-3.6,-3.4 -4.7,-8.7 -3.1,-14.5 0.8,-2.8 2,-6.4 2.7,-8.2 1.1,-2.6 1.1,-4.4 0,-9.5 -1.5,-7.5 -2.4,-8.8 -6.3,-8.8 -1.6,-0 -3.1,-0.6 -3.4,-1.5 -0.8,-2.1 1.4,-7.3 3.4,-7.9 3.5,-1.1 27.5,0.4 33,2zM125.5,38.1c0.4,0.6 -0.2,1.3 -1.4,1.6 -1.2,0.3 -2.1,0.9 -2.1,1.4 0,1.2 -4.9,3.1 -6,2.4 -1.5,-0.9 0,-3.5 2.9,-5 3.1,-1.7 5.7,-1.9 6.6,-0.4zM108.7,45.5c3.8,1.9 5.7,4.1 4.8,5.5 -1.8,3 -9.5,-1 -9.5,-4.9 0,-2.5 0.7,-2.6 4.7,-0.6zM104,56c0.9,-0.5 1.9,-0.5 2.7,0.2 0.9,0.8 2.1,0.8 3.6,0.1 2.7,-1.2 4.8,-0.6 4.1,1.1 -0.3,0.7 2,3.9 5,7 3.1,3.1 5.6,6.1 5.6,6.6 0,0.5 -1,2.5 -2.2,4.3 -1.3,1.9 -3.1,4.9 -4,6.6 -0.9,1.7 -2.5,3.1 -3.4,3.1 -1.9,-0 -8.4,-3.8 -8.4,-4.9 0,-0.4 1.6,-2.1 3.5,-3.8 1.9,-1.7 3.5,-3.5 3.5,-4 0,-1.4 -4.2,-5 -6.7,-5.7 -1.8,-0.6 -2.5,-0.1 -3.7,2.6 -0.7,1.8 -2.8,4.4 -4.5,5.8 -2.8,2.2 -2.9,2.6 -1.5,4.1 0.9,1 1.3,2.3 0.9,2.8 -0.9,1.6 -3.5,1.3 -3.5,-0.4 0,-2.3 -1.9,-1.8 -6.4,1.7 -4.6,3.5 -8.6,9 -8.6,11.8 0,1.9 6.2,8 8.2,8 0.6,-0 1.9,0.7 2.9,1.6 2.3,2.1 4.6,1.2 6,-2.3 0.6,-1.5 1.7,-4.2 2.4,-5.8 0.7,-1.7 1.7,-4.2 2.3,-5.8 0.8,-1.8 1.9,-2.7 3.5,-2.7 1.2,-0 4.7,1.2 7.6,2.7 5.4,2.9 7.1,5 10.6,14.3 0.9,2.5 2.4,5.8 3.2,7.3 1.7,3.2 0.4,5.7 -2.8,5.7 -1.4,-0 -1.9,-0.7 -1.9,-3 0,-2.5 -0.4,-3 -2.5,-3 -3.8,-0 -9.5,2.7 -9.5,4.4 0,0.9 0.6,1.6 1.4,1.6 2.2,-0 3,1.9 1.6,3.6 -1.3,1.5 -2.6,2.2 -10.7,6.3 -7.1,3.6 -8.7,5.1 -14.3,13.2 -3.3,4.9 -5,8.4 -5,10.5 0,4.6 -1.1,4.9 -4.5,0.9 -2.7,-3.3 -3.6,-3.7 -9,-4.2 -5.9,-0.5 -6.1,-0.4 -9.8,3.3 -3.4,3.5 -3.8,4.3 -3.5,8.4 0.3,4.9 0,4.8 7.9,3.4 2.9,-0.5 3.7,-0.2 4.3,1.3 1.9,5.2 6.8,11.3 9.3,11.3 1,0.1 7.4,0.5 14.3,1 15.9,1.1 19.9,2.7 26.1,10.7 3.6,4.7 5.5,6.1 9,7.2 17,5.1 17.5,5.7 13.5,18.6 -3.6,11.5 -3.9,12.1 -9.4,16.1 -4.7,3.3 -8.1,7 -18.2,19.6 -1.7,2 -6.1,1.7 -11,-0.7 -1.4,-0.7 -4.7,-2.4 -7.5,-3.7l-5,-2.4 -0.6,-7.5c-0.5,-6.6 -1.2,-8.7 -6.8,-19.4 -5.8,-11 -6.2,-12.4 -5.7,-16.8 0.3,-2.6 1.2,-5.7 2.1,-6.9 3.6,-5.2 0.7,-11.2 -7.3,-14.8 -7.8,-3.5 -11.5,-5.2 -15.2,-6.8 -9.4,-4.1 -10.5,-5 -15.6,-13.3 -2.9,-4.5 -5.9,-8.6 -6.9,-9.1 -1.8,-1.1 -1.7,-2.1 0.6,-18.3 2.3,-15.9 8.2,-31 18.3,-46.3 5.7,-8.6 9.1,-11.5 12.4,-10.7 3.3,0.8 4.6,-0.3 2.7,-2.5 -1.5,-1.7 -1.3,-2.1 3.2,-6.8 2.6,-2.7 5.8,-5.5 7,-6.1 3.2,-1.6 7,-1.3 7.7,0.5 0.7,1.7 -0.7,3.7 -5.8,8.6 -1.7,1.5 -2.7,3 -2.4,3.4 0.4,0.3 2.9,0.3 5.7,-0.1 3.5,-0.5 5.4,-1.3 6.4,-2.8 0.8,-1.2 3.3,-4.6 5.7,-7.5 3.8,-4.9 4.3,-5.2 5.9,-3.8 1.1,1 2.1,1.2 3.1,0.6zM91.8,57.2c-0.4,2.7 -2.8,3.6 -2.8,1 0,-2 0.8,-3.2 2.2,-3.2 0.5,-0 0.8,1 0.6,2.2zM221.3,68.6c2.6,2.5 5.2,5.6 5.9,6.9 0.7,1.2 3.4,4.9 6,8.1 11.9,14.7 20.3,40.7 20.3,62.9 0,14.1 -4.2,32.2 -10.4,45.5 -2.4,5.1 -9.5,17.2 -11.7,19.9 -8,9.9 -18,19.8 -22.5,22.1 -1.4,0.8 -2,0.8 -2.3,-0.2 -0.8,-2.9 -4,-13.6 -5.1,-17.3 -0.7,-2.2 -2.1,-6.7 -3,-10 -1,-3.3 -2.4,-7.8 -3.1,-10 -0.8,-2.3 -1.4,-4.8 -1.4,-5.7 0,-0.9 -0.9,-2.6 -1.9,-3.9 -1.8,-2.2 -2.8,-2.4 -13.8,-2.9 -11.1,-0.5 -12.1,-0.7 -16.3,-3.6l-4.5,-3 0.1,-7c0.1,-6.5 0.6,-7.7 6.8,-19.9 5.7,-11 6.7,-13.5 6.2,-16.6 -0.7,-4.3 1.3,-7.6 6,-9.5 3,-1.3 3.2,-1.6 2.7,-4.9 -0.3,-2.1 -0.1,-4.1 0.7,-5 1,-1.2 0.7,-2 -1.4,-4.6 -2.1,-2.5 -2.6,-4 -2.4,-7.2 0.3,-4.5 1.8,-5.7 3.3,-2.8 0.6,1 1.8,3.3 2.8,5 1.4,2.6 1.6,3.6 0.6,4.7 -2.5,3 0.9,1.3 10.6,-5.3 4.4,-3 4.9,-3.1 6.8,-1.8 1.2,0.8 2.8,1.5 3.5,1.5 1.9,-0 15.2,-11.3 14.5,-12.3 -0.3,-0.5 -1.6,-1.3 -3,-1.8 -1.4,-0.5 -2.7,-1.8 -3,-2.9 -0.3,-1.1 -0.9,-2 -1.3,-2 -0.9,-0 -8,11.4 -8,12.9 0,2.3 -2.7,0.9 -7.4,-3.8 -3.1,-3.3 -4.6,-5.4 -4.1,-6.3 0.5,-0.7 4,-5.6 7.9,-11 10.7,-14.6 14.2,-15.9 21.9,-8.2zM182.5,77c1.2,2 -1.5,5.1 -4.3,4.8 -3.3,-0.4 -4.4,-4.3 -1.5,-5.1 3.2,-0.8 5.2,-0.7 5.8,0.3z"/>
+    <path android:fillColor="#FFF"
+        android:pathData="M97.1,63.3c-3.4,7 -2.3,10.9 2.1,7.4 2.6,-2 3.3,-11.7 0.8,-11.7 -0.5,-0 -1.8,1.9 -2.9,4.3z"/>
+    <path android:fillColor="#FFF"
+        android:pathData="M86.5,118c-0.4,0.6 -0.3,1.6 0.3,2.2 0.6,0.6 1.2,0.6 1.7,-0.2 0.4,-0.6 0.3,-1.6 -0.3,-2.2 -0.6,-0.6 -1.2,-0.6 -1.7,0.2z"/>
+    <path android:fillColor="#FFF"
+        android:pathData="M224.4,121.4c-0.3,0.8 -0.4,2.3 -0.2,3.3 0.3,1.5 1.5,1.9 7.1,2.1 5.3,0.2 6.7,-0 6.7,-1.1 0,-0.8 -0.8,-1.8 -1.7,-2.1 -1,-0.3 -2.9,-1.3 -4.3,-2.1 -3.2,-1.9 -6.9,-1.9 -7.6,-0.1z"/>
+    <path android:fillColor="#FFF"
+        android:pathData="M202.2,124.5c0.6,1.4 1.7,2.5 2.5,2.5 0.8,-0 1.3,1.2 1.3,3 0,4 -1.9,3.8 -4.9,-0.5 -3.4,-5 -7.9,-4.9 -15.2,0.6 -7.4,5.5 -7.1,6.5 2.1,6.1l7.5,-0.3 5.4,4.7c5,4.5 5.7,4.8 10.5,4.7 2.9,-0.1 7.9,-0.8 11.3,-1.7 3.3,-0.9 7,-1.6 8.1,-1.6 2.1,-0 3.5,-2.2 2.6,-4.3 -0.6,-1.6 -11,-4.8 -16.2,-4.9 -3.5,-0 -4.6,-0.6 -8,-4.3 -2.1,-2.3 -4.8,-4.8 -6,-5.4 -2.1,-1.1 -2.1,-1 -1,1.4z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_setup_finish.xml b/app/src/main/res/drawable/ic_setup_finish.xml
deleted file mode 100644
index 1999946a8..000000000
--- a/app/src/main/res/drawable/ic_setup_finish.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2013 The Android Open Source Project
-    SPDX-License-Identifier: Apache-2.0
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/unbundled_check_01" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/unbundled_check_01" />
-    <item>
-        <bitmap
-            android:src="@drawable/unbundled_check_01"
-            android:tint="@android:color/holo_blue_light"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/ic_setup_key.xml b/app/src/main/res/drawable/ic_setup_key.xml
new file mode 100644
index 000000000..2cbbdc25d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_setup_key.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="120"
+    android:viewportWidth="120">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M0,60l0,60 60,-0 60,-0 0,-60 0,-60 -60,-0 -60,-0 0,60zM70.3,29.5c1.6,4.4 3.3,9.3 3.7,11 0.5,1.6 3.2,9.5 6,17.5 2.8,8 5.5,15.8 6,17.5 0.5,1.6 1.9,5.8 3.1,9.3 2.7,7.5 2.3,8.2 -5.7,8.2 -5.5,-0 -9.4,-2.5 -9.4,-5.9 0,-1.1 -0.7,-2.2 -1.6,-2.5 -2.2,-0.9 -25.7,-0.7 -27,0.2 -0.7,0.4 -2.1,3.8 -3.3,7.7 -1.2,3.8 -2.7,7.3 -3.4,7.7 -1.7,1.1 -13.5,1 -14.2,-0.2 -0.6,-0.9 0.8,-5.2 10.6,-33 2.7,-8 5.4,-15.9 5.9,-17.5 0.7,-2.5 7.8,-22.9 9.5,-27.3 0.3,-0.9 2.7,-1.2 8.7,-1l8.2,0.3 2.9,8zM77.8,101.9c0.9,0.5 1.2,2.5 1,5.7l-0.3,4.9 -4.5,0.3c-3.1,0.2 -4.8,-0.1 -5.5,-1.2 -1.1,-1.5 -1.1,-7.8 0,-9.6 0.7,-1.2 7.5,-1.3 9.3,-0.1zM94.6,103.4c0.3,1.3 0.4,3.8 0.2,5.7l-0.3,3.4 -5.5,-0 -5.5,-0 -0.3,-3.4c-0.2,-1.9 -0.1,-4.4 0.2,-5.7 0.6,-2.1 1.2,-2.4 5.6,-2.4 4.4,-0 5,0.3 5.6,2.4zM109.5,107l0,5.5 -4.3,0.3c-5.2,0.4 -7.2,-1 -7.2,-5 0,-5.4 1.6,-6.9 6.8,-6.6l4.7,0.3 0,5.5z"/>
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M56.6,44.6c-0.3,0.9 -0.6,2.4 -0.6,3.4 0,1.1 -0.6,3.4 -1.4,5.2 -2.4,5.7 -4.6,13.2 -4.6,15.5 0,2.2 0.3,2.3 9,2.3 8.9,-0 9,-0 9,-2.5 0,-1.3 -0.6,-4.2 -1.4,-6.2 -1.9,-5.4 -4.3,-13.3 -5,-16.6 -0.7,-3 -4,-3.8 -5,-1.1z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_setup_select.xml b/app/src/main/res/drawable/ic_setup_select.xml
new file mode 100644
index 000000000..87c807479
--- /dev/null
+++ b/app/src/main/res/drawable/ic_setup_select.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_setup_step1.xml b/app/src/main/res/drawable/ic_setup_step1.xml
deleted file mode 100644
index 3d68d7a2c..000000000
--- a/app/src/main/res/drawable/ic_setup_step1.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2013 The Android Open Source Project
-    SPDX-License-Identifier: Apache-2.0
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/unbundled_key_01" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/unbundled_key_01" />
-    <item>
-        <bitmap
-            android:src="@drawable/unbundled_key_01"
-            android:tint="@android:color/holo_blue_light"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/ic_setup_step2.xml b/app/src/main/res/drawable/ic_setup_step2.xml
deleted file mode 100644
index bd97c84f9..000000000
--- a/app/src/main/res/drawable/ic_setup_step2.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2013 The Android Open Source Project
-    SPDX-License-Identifier: Apache-2.0
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/unbundled_select_01" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/unbundled_select_01" />
-    <item>
-        <bitmap
-            android:src="@drawable/unbundled_select_01"
-            android:tint="@android:color/holo_blue_light"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/ic_setup_step3.xml b/app/src/main/res/drawable/ic_setup_step3.xml
deleted file mode 100644
index d1bb6c5a6..000000000
--- a/app/src/main/res/drawable/ic_setup_step3.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2013 The Android Open Source Project
-    SPDX-License-Identifier: Apache-2.0
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/unbundled_earth_01" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/unbundled_earth_01" />
-    <item>
-        <bitmap
-            android:src="@drawable/unbundled_earth_01"
-            android:tint="@android:color/holo_blue_light"/>
-    </item>
-</selector>