diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index 98ef02b..ae3c19d 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -23,18 +23,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="?attr/inputViewStyle">
-    <LinearLayout
-        android:id="@+id/horizontal_keyboard_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:gravity="bottom"
-        android:orientation="horizontal">
-        <include
-            android:id="@+id/main_keyboard_frame"
-            layout="@layout/main_keyboard_frame" />
-        <include
-            android:id="@+id/emoji_palettes_view"
-            layout="@layout/emoji_palettes_view" />
-    </LinearLayout>
+    <include
+        android:id="@+id/main_keyboard_frame"
+        layout="@layout/main_keyboard_frame" />
+    <include
+        android:id="@+id/emoji_palettes_view"
+        layout="@layout/emoji_palettes_view" />
 </com.android.inputmethod.latin.InputView>
diff --git a/java/res/values/donottranslate-debug-settings.xml b/java/res/values/donottranslate-debug-settings.xml
index 55ab933..491043f 100644
--- a/java/res/values/donottranslate-debug-settings.xml
+++ b/java/res/values/donottranslate-debug-settings.xml
@@ -47,12 +47,6 @@
     <string name="prefs_resize_keyboard">Enable keyboard resizing</string>
     <!-- Title of the settings for setting keyboard height -->
     <string name="prefs_keyboard_height_scale">Keyboard height scale</string>
-    <!-- Title of the settings for setting keyboard width -->
-    <string name="prefs_keyboard_bottom_margin">Keyboard bottom margin</string>
-    <!-- Title of the settings for setting keyboard width -->
-    <string name="prefs_keyboard_left_margin">Keyboard left margin</string>
-    <!-- Title of the settings for setting keyboard width -->
-    <string name="prefs_keyboard_right_margin">Keyboard right margin</string>
     <!-- Message to show when there are no files to install as an external dictionary [CHAR LIMIT=100] -->
     <string name="read_external_dictionary_no_files_message">No dictionary files in the Downloads folder</string>
     <!-- Title of the dialog that selects a file to install as an external dictionary [CHAR LIMIT=50] -->
diff --git a/java/res/xml/prefs_screen_debug.xml b/java/res/xml/prefs_screen_debug.xml
index 3134727..905bc04 100644
--- a/java/res/xml/prefs_screen_debug.xml
+++ b/java/res/xml/prefs_screen_debug.xml
@@ -87,24 +87,6 @@
         android:title="@string/prefs_keyboard_height_scale"
         latin:minValue="50"
         latin:maxValue="120" /> <!-- percentage -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
-        android:dependency="pref_resize_keyboard"
-        android:key="pref_keyboard_bottom_margin"
-        android:title="@string/prefs_keyboard_bottom_margin"
-        latin:minValue="0"
-        latin:maxValue="50" /> <!-- percentage -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
-        android:dependency="pref_resize_keyboard"
-        android:key="pref_keyboard_left_margin"
-        android:title="@string/prefs_keyboard_left_margin"
-        latin:minValue="0"
-        latin:maxValue="50" /> <!-- percentage -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
-        android:dependency="pref_resize_keyboard"
-        android:key="pref_keyboard_right_margin"
-        android:title="@string/prefs_keyboard_right_margin"
-        latin:minValue="0"
-        latin:maxValue="50" /> <!-- percentage -->
     <PreferenceScreen
         android:key="read_external_dictionary"
         android:title="@string/prefs_read_external_dictionary" />