diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml
index a29a19452..c4d6f66c3 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -59,7 +59,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/keyboard"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
diff --git a/app/src/leanback/res/layout/adapter_keyboard_icon.xml b/app/src/leanback/res/layout/adapter_keyboard_icon.xml
index b97edebab..365fbef5b 100644
--- a/app/src/leanback/res/layout/adapter_keyboard_icon.xml
+++ b/app/src/leanback/res/layout/adapter_keyboard_icon.xml
@@ -2,10 +2,10 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/icon"
-    android:layout_width="44dp"
-    android:layout_height="44dp"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
     android:background="@drawable/selector_keyboard"
     android:focusable="true"
+    android:scaleType="center"
     android:focusableInTouchMode="true"
-    android:padding="6dp"
     tools:src="@drawable/ic_keyboard_back" />
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/adapter_keyboard_text.xml b/app/src/leanback/res/layout/adapter_keyboard_text.xml
index 43193b45a..e00ddc868 100644
--- a/app/src/leanback/res/layout/adapter_keyboard_text.xml
+++ b/app/src/leanback/res/layout/adapter_keyboard_text.xml
@@ -2,13 +2,12 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/text"
-    android:layout_width="44dp"
-    android:layout_height="44dp"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
     android:background="@drawable/selector_keyboard"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"
-    android:padding="6dp"
     android:textColor="@color/white"
     android:textSize="16sp"
     tools:text="0" />