diff --git a/app/src/leanback/res/drawable-hdpi/ic_keyboard_back.png b/app/src/leanback/res/drawable-hdpi/ic_keyboard_back.png
deleted file mode 100644
index 2d76915e7..000000000
Binary files a/app/src/leanback/res/drawable-hdpi/ic_keyboard_back.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-hdpi/ic_keyboard_enter.png b/app/src/leanback/res/drawable-hdpi/ic_keyboard_enter.png
deleted file mode 100644
index e515fc1d2..000000000
Binary files a/app/src/leanback/res/drawable-hdpi/ic_keyboard_enter.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-hdpi/ic_keyboard_left.png b/app/src/leanback/res/drawable-hdpi/ic_keyboard_left.png
deleted file mode 100644
index 66a2c452d..000000000
Binary files a/app/src/leanback/res/drawable-hdpi/ic_keyboard_left.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-hdpi/ic_keyboard_right.png b/app/src/leanback/res/drawable-hdpi/ic_keyboard_right.png
deleted file mode 100644
index 34d9d9ff2..000000000
Binary files a/app/src/leanback/res/drawable-hdpi/ic_keyboard_right.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-mdpi/ic_keyboard_back.png b/app/src/leanback/res/drawable-mdpi/ic_keyboard_back.png
deleted file mode 100644
index dd1dbf7e5..000000000
Binary files a/app/src/leanback/res/drawable-mdpi/ic_keyboard_back.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-mdpi/ic_keyboard_enter.png b/app/src/leanback/res/drawable-mdpi/ic_keyboard_enter.png
deleted file mode 100644
index dc3abed0f..000000000
Binary files a/app/src/leanback/res/drawable-mdpi/ic_keyboard_enter.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-mdpi/ic_keyboard_left.png b/app/src/leanback/res/drawable-mdpi/ic_keyboard_left.png
deleted file mode 100644
index 3185e24bc..000000000
Binary files a/app/src/leanback/res/drawable-mdpi/ic_keyboard_left.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-mdpi/ic_keyboard_right.png b/app/src/leanback/res/drawable-mdpi/ic_keyboard_right.png
deleted file mode 100644
index 9e8318f83..000000000
Binary files a/app/src/leanback/res/drawable-mdpi/ic_keyboard_right.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_back.png b/app/src/leanback/res/drawable-xhdpi/ic_keyboard_back.png
deleted file mode 100644
index 7756a411d..000000000
Binary files a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_back.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_enter.png b/app/src/leanback/res/drawable-xhdpi/ic_keyboard_enter.png
deleted file mode 100644
index b8d6eb4a1..000000000
Binary files a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_enter.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_left.png b/app/src/leanback/res/drawable-xhdpi/ic_keyboard_left.png
deleted file mode 100644
index f82c7d332..000000000
Binary files a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_left.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_right.png b/app/src/leanback/res/drawable-xhdpi/ic_keyboard_right.png
deleted file mode 100644
index 138069e0c..000000000
Binary files a/app/src/leanback/res/drawable-xhdpi/ic_keyboard_right.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_back.png b/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_back.png
deleted file mode 100644
index 3880f030c..000000000
Binary files a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_back.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_enter.png b/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_enter.png
deleted file mode 100644
index 7df064d2e..000000000
Binary files a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_enter.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_left.png b/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_left.png
deleted file mode 100644
index e31b8fe96..000000000
Binary files a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_left.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_right.png b/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_right.png
deleted file mode 100644
index af8523b0c..000000000
Binary files a/app/src/leanback/res/drawable-xxhdpi/ic_keyboard_right.png and /dev/null differ
diff --git a/app/src/leanback/res/drawable/ic_keyboard_back.xml b/app/src/leanback/res/drawable/ic_keyboard_back.xml
new file mode 100644
index 000000000..8c5cc1bac
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_keyboard_back.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/white"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m22.4,31.7 l5.6,-5.6 5.6,5.6 2.15,-2.15L30.1,24l5.55,-5.55 -2.15,-2.15 -5.5,5.6 -5.6,-5.6 -2.15,2.15L25.9,24l-5.65,5.55ZM6,24l8.45,-11.95q0.65,-0.9 1.55,-1.475 0.9,-0.575 2,-0.575h21q1.25,0 2.125,0.875T42,13v22q0,1.25 -0.875,2.125T39,38L18,38q-1.1,0 -2,-0.575 -0.9,-0.575 -1.55,-1.475ZM9.75,24 L17.45,35L39,35L39,13L17.45,13ZM39,24L39,13v22Z" />
+</vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_enter.xml b/app/src/leanback/res/drawable/ic_keyboard_enter.xml
new file mode 100644
index 000000000..0d0ebe8cc
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_keyboard_enter.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/white"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,36 L6.05,24.05 18,12.1l2.15,2.15 -8.35,8.35H39V14h3v11.55H11.85l8.3,8.3Z" />
+</vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_left.xml b/app/src/leanback/res/drawable/ic_keyboard_left.xml
new file mode 100644
index 000000000..ca2e3c5fa
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_keyboard_left.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/white"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M28.05,36 L16,23.95 28.05,11.9l2.15,2.15 -9.9,9.9 9.9,9.9Z" />
+</vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_right.xml b/app/src/leanback/res/drawable/ic_keyboard_right.xml
new file mode 100644
index 000000000..fed116a79
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_keyboard_right.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/white"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m18.75,36 l-2.15,-2.15 9.9,-9.9 -9.9,-9.9 2.15,-2.15L30.8,23.95Z" />
+</vector>
diff --git a/app/src/leanback/res/layout/adapter_keyboard.xml b/app/src/leanback/res/layout/adapter_keyboard.xml
index 10e2ed745..bf01ca884 100644
--- a/app/src/leanback/res/layout/adapter_keyboard.xml
+++ b/app/src/leanback/res/layout/adapter_keyboard.xml
@@ -5,7 +5,8 @@
     android:layout_height="40dp"
     android:background="@drawable/selector_item"
     android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:focusableInTouchMode="true"
+    android:padding="8dp">
 
     <TextView
         android:id="@+id/text"