diff --git a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
index dcb09294d..4f8b05f0f 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
@@ -24,11 +24,6 @@ fun createToolbarKey(context: Context, keyboardAttr: TypedArray, key: ToolbarKey
     val contentDescriptionId = context.resources.getIdentifier(key.name.lowercase(), "string", context.packageName)
     if (contentDescriptionId != 0)
         button.contentDescription = context.getString(contentDescriptionId)
-    if (key == LEFT || key == RIGHT || key == UP || key == DOWN) {
-        // arrows look a little awkward when not scaled
-        button.scaleX = 1.2f
-        button.scaleY = 1.2f
-    }
     button.isActivated = !when (key) {
         INCOGNITO -> Settings.readAlwaysIncognitoMode(DeviceProtectedUtils.getSharedPreferences(context))
         ONE_HANDED -> Settings.getInstance().current.mOneHandedModeEnabled
diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml
deleted file mode 100644
index 2b87db0be..000000000
--- a/app/src/main/res/drawable/ic_arrow_up.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="90"
-    android:drawable="@drawable/ic_arrow_left">
-</rotate>
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_dpad_down.xml
similarity index 70%
rename from app/src/main/res/drawable/ic_arrow_down.xml
rename to app/src/main/res/drawable/ic_dpad_down.xml
index e112dc055..8b329d1c2 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_dpad_down.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromDegrees="270"
-    android:drawable="@drawable/ic_arrow_left">
+    android:drawable="@drawable/ic_dpad_left">
 </rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_down_rounded.xml b/app/src/main/res/drawable/ic_dpad_down_rounded.xml
similarity index 67%
rename from app/src/main/res/drawable/ic_arrow_down_rounded.xml
rename to app/src/main/res/drawable/ic_dpad_down_rounded.xml
index 74d51614f..dcd28503f 100644
--- a/app/src/main/res/drawable/ic_arrow_down_rounded.xml
+++ b/app/src/main/res/drawable/ic_dpad_down_rounded.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromDegrees="270"
-    android:drawable="@drawable/ic_arrow_left_rounded">
+    android:drawable="@drawable/ic_dpad_left_rounded">
 </rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_dpad_left.xml b/app/src/main/res/drawable/ic_dpad_left.xml
new file mode 100644
index 000000000..a8f01bece
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dpad_left.xml
@@ -0,0 +1,17 @@
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <group android:scaleX="1.2"
+        android:scaleY="1.2"
+        android:translateX="-2.4"
+        android:translateY="-2.4">
+        <path android:fillColor="#FFF"
+            android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_dpad_left_rounded.xml b/app/src/main/res/drawable/ic_dpad_left_rounded.xml
new file mode 100644
index 000000000..048ce37c3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dpad_left_rounded.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: Material Design Authors / Google LLC
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <group android:scaleX="1.2"
+        android:scaleY="1.2"
+        android:translateX="-96"
+        android:translateY="-96">
+        <path android:fillColor="#FFF"
+            android:pathData="M432,480L588,636Q599,647 599,664Q599,681 588,692Q577,703 560,703Q543,703 532,692L348,508Q342,502 339.5,495Q337,488 337,480Q337,472 339.5,465Q342,458 348,452L532,268Q543,257 560,257Q577,257 588,268Q599,279 599,296Q599,313 588,324L432,480Z"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_dpad_right.xml b/app/src/main/res/drawable/ic_dpad_right.xml
new file mode 100644
index 000000000..3e780da8c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dpad_right.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="180"
+    android:drawable="@drawable/ic_dpad_left">
+</rotate>
diff --git a/app/src/main/res/drawable/ic_dpad_right_rounded.xml b/app/src/main/res/drawable/ic_dpad_right_rounded.xml
new file mode 100644
index 000000000..058416180
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dpad_right_rounded.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="180"
+    android:drawable="@drawable/ic_dpad_left_rounded">
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_up_rounded.xml b/app/src/main/res/drawable/ic_dpad_up.xml
similarity index 67%
rename from app/src/main/res/drawable/ic_arrow_up_rounded.xml
rename to app/src/main/res/drawable/ic_dpad_up.xml
index 7f601c4fa..f1b58af28 100644
--- a/app/src/main/res/drawable/ic_arrow_up_rounded.xml
+++ b/app/src/main/res/drawable/ic_dpad_up.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromDegrees="90"
-    android:drawable="@drawable/ic_arrow_left_rounded">
-</rotate>
\ No newline at end of file
+    android:drawable="@drawable/ic_dpad_left">
+</rotate>
diff --git a/app/src/main/res/drawable/ic_dpad_up_rounded.xml b/app/src/main/res/drawable/ic_dpad_up_rounded.xml
new file mode 100644
index 000000000..5a91ef348
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dpad_up_rounded.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="90"
+    android:drawable="@drawable/ic_dpad_left_rounded">
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml b/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml
index 5c4b54897..7c31427bd 100644
--- a/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml
@@ -1,4 +1,5 @@
-<!-- it's the arrow up icon, but with a different name -->
+<?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_arrow_up">
-</rotate>
+    android:fromDegrees="90"
+    android:drawable="@drawable/ic_arrow_left">
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml b/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml
index d3df2e6f0..7f601c4fa 100644
--- a/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml
+++ b/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml
@@ -1,4 +1,5 @@
-<!-- it's the arrow up icon, but with a different name -->
+<?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_arrow_up_rounded">
-</rotate>
+    android:fromDegrees="90"
+    android:drawable="@drawable/ic_arrow_left_rounded">
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sym_keyboard_switch_onehanded_holo.xml b/app/src/main/res/drawable/sym_keyboard_switch_onehanded_holo.xml
deleted file mode 100644
index cbf7391e8..000000000
--- a/app/src/main/res/drawable/sym_keyboard_switch_onehanded_holo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-    icon available in Android Studio
-    SPDX-License-Identifier: Apache-2.0
--->
-<!-- todo: remove / merge with ic_arrow_left -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24"  >
-    <path android:fillColor="#FFF"
-        android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
-</vector>
diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml
index 1eae6d2d7..58a520487 100644
--- a/app/src/main/res/values/keyboard-icons-holo.xml
+++ b/app/src/main/res/values/keyboard-icons-holo.xml
@@ -34,15 +34,15 @@
         <item name="iconClearClipboardKey">@drawable/sym_keyboard_clear_clipboard_holo</item>
         <item name="iconStartOneHandedMode">@drawable/sym_keyboard_start_onehanded_holo</item>
         <item name="iconStopOneHandedMode">@drawable/sym_keyboard_stop_onehanded_holo</item>
-        <item name="iconSwitchOneHandedMode">@drawable/sym_keyboard_switch_onehanded_holo</item>
+        <item name="iconSwitchOneHandedMode">@drawable/ic_arrow_left</item>
         <item name="iconResizeOneHandedMode">@drawable/ic_arrow_horizontal</item>
         <item name="iconNumpadKey">@drawable/sym_keyboard_numpad_key_holo</item>
         <item name="iconToolbarKey">@drawable/ic_arrow_right</item>
         <item name="iconSelectAll">@drawable/ic_select_all</item>
-        <item name="iconArrowLeft">@drawable/ic_arrow_left</item>
-        <item name="iconArrowRight">@drawable/ic_arrow_right</item>
-        <item name="iconArrowUp">@drawable/ic_arrow_up</item>
-        <item name="iconArrowDown">@drawable/ic_arrow_down</item>
+        <item name="iconArrowLeft">@drawable/ic_dpad_left</item>
+        <item name="iconArrowRight">@drawable/ic_dpad_right</item>
+        <item name="iconArrowUp">@drawable/ic_dpad_up</item>
+        <item name="iconArrowDown">@drawable/ic_dpad_down</item>
         <item name="iconBin">@drawable/ic_delete</item>
         <item name="iconUndo">@drawable/ic_undo</item>
         <item name="iconRedo">@drawable/ic_redo</item>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light.xml b/app/src/main/res/values/keyboard-icons-lxx-light.xml
index f673403fe..237a3e864 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml
@@ -44,10 +44,10 @@
         <item name="iconNumpadKey">@drawable/sym_keyboard_numpad_key_lxx</item>
         <item name="iconToolbarKey">@drawable/ic_arrow_right</item>
         <item name="iconSelectAll">@drawable/ic_select_all</item>
-        <item name="iconArrowLeft">@drawable/ic_arrow_left</item>
-        <item name="iconArrowRight">@drawable/ic_arrow_right</item>
-        <item name="iconArrowUp">@drawable/ic_arrow_up</item>
-        <item name="iconArrowDown">@drawable/ic_arrow_down</item>
+        <item name="iconArrowLeft">@drawable/ic_dpad_left</item>
+        <item name="iconArrowRight">@drawable/ic_dpad_right</item>
+        <item name="iconArrowUp">@drawable/ic_dpad_up</item>
+        <item name="iconArrowDown">@drawable/ic_dpad_down</item>
         <item name="iconBin">@drawable/ic_delete</item>
         <item name="iconUndo">@drawable/ic_undo</item>
         <item name="iconRedo">@drawable/ic_redo</item>
diff --git a/app/src/main/res/values/keyboard-icons-rounded.xml b/app/src/main/res/values/keyboard-icons-rounded.xml
index 105d73f4e..dcf571c4f 100644
--- a/app/src/main/res/values/keyboard-icons-rounded.xml
+++ b/app/src/main/res/values/keyboard-icons-rounded.xml
@@ -43,10 +43,10 @@
         <item name="iconNumpadKey">@drawable/sym_keyboard_numpad_key_lxx</item>
         <item name="iconToolbarKey">@drawable/ic_arrow_right_rounded</item>
         <item name="iconSelectAll">@drawable/ic_select_all_rounded</item>
-        <item name="iconArrowLeft">@drawable/ic_arrow_left_rounded</item>
-        <item name="iconArrowRight">@drawable/ic_arrow_right_rounded</item>
-        <item name="iconArrowUp">@drawable/ic_arrow_up_rounded</item>
-        <item name="iconArrowDown">@drawable/ic_arrow_down_rounded</item>
+        <item name="iconArrowLeft">@drawable/ic_dpad_left_rounded</item>
+        <item name="iconArrowRight">@drawable/ic_dpad_right_rounded</item>
+        <item name="iconArrowUp">@drawable/ic_dpad_up_rounded</item>
+        <item name="iconArrowDown">@drawable/ic_dpad_down_rounded</item>
         <item name="iconBin">@drawable/ic_delete_rounded</item>
         <item name="iconUndo">@drawable/ic_undo_rounded</item>
         <item name="iconRedo">@drawable/ic_redo_rounded</item>