diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java
index 03bb1798..d06b157c 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java
@@ -22,7 +22,7 @@ class MainLayoutSmall extends MainLayoutTray {
 			height = super.getHeight(forceRecalculate);
 
 			if (!isCommandPaletteShown() && !isTextEditingPaletteShown()) {
-				height += tt9.getResources().getDimensionPixelSize(R.dimen.main_small_key_wrapper_height);
+				height += tt9.getResources().getDimensionPixelSize(R.dimen.main_small_main_key_wrapper_height);
 			}
 		}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java
index f7d85421..c2f9dfc8 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java
@@ -24,7 +24,7 @@ class MainLayoutTray extends BaseMainLayout {
 			height = resources.getDimensionPixelSize(R.dimen.status_bar_height) + getBottomInsetSize();
 
 			if (isCommandPaletteShown() || isTextEditingPaletteShown()) {
-				height += resources.getDimensionPixelSize(R.dimen.main_small_key_text_editing_height);
+				height += resources.getDimensionPixelSize(R.dimen.main_small_command_palette_height);
 			}
 		}
 
diff --git a/app/src/main/res/layout/panel_small_command_palette.xml b/app/src/main/res/layout/panel_small_command_palette.xml
index d881fd4a..dbae3513 100644
--- a/app/src/main/res/layout/panel_small_command_palette.xml
+++ b/app/src/main/res/layout/panel_small_command_palette.xml
@@ -2,10 +2,8 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	tools:showIn="@layout/main_small"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="horizontal">
+	style="@style/TTheme.CommandPalette.Wrapper"
+	tools:showIn="@layout/main_small">
 
 	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		style="@style/TTheme.CommandPalette.Key"
diff --git a/app/src/main/res/layout/pref_deletable_word_large.xml b/app/src/main/res/layout/pref_deletable_word_large.xml
index 45c8780f..a9f3b6e0 100644
--- a/app/src/main/res/layout/pref_deletable_word_large.xml
+++ b/app/src/main/res/layout/pref_deletable_word_large.xml
@@ -15,7 +15,7 @@
 		android:paddingEnd="15dp"
 		android:text="✕"
 		android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
-		android:textSize="@dimen/main_small_key_icon_size"
+		android:textSize="@dimen/pref_deletable_word_icon_size"
 		tools:ignore="HardcodedText,RtlSymmetry" />
 
 	<TextView
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 79d13e9d..28928983 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,14 +16,14 @@
 	<dimen name="main_small_suggestion_spacing_horizontal">6sp</dimen>
 	<dimen name="main_small_suggestion_text_size">18sp</dimen>
 
-	<dimen name="main_small_key_icon_size">32sp</dimen>
-	<dimen name="main_small_key_text_editing_height">66dp</dimen>
-	<dimen name="main_small_key_wrapper_height">46dp</dimen> <!-- key height + margin -->
+	<dimen name="main_small_main_key_wrapper_height">46dp</dimen> <!-- key height + margin -->
+	<dimen name="main_small_command_palette_height">66dp</dimen>
 
 	<!-- Preferences, default font size -->
 	<dimen name="pref_custom_min_height">48dp</dimen>
 	<dimen name="pref_custom_spacing_horizontal">16dp</dimen>
 	<dimen name="pref_custom_spacing_vertical">12dp</dimen>
+	<dimen name="pref_deletable_word_icon_size">32sp</dimen>
 	<dimen name="pref_search_height">72dp</dimen>
 
 	<!-- Preferences, large font size -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d4b78d32..52906b35 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -79,7 +79,7 @@
 	<style name="TTheme.MainSmall.Wrapper" parent="">
 		<item name="android:baselineAligned">true</item>
 		<item name="android:gravity">center</item>
-		<item name="android:layout_height">@dimen/main_small_key_wrapper_height</item>
+		<item name="android:layout_height">@dimen/main_small_main_key_wrapper_height</item>
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:orientation">horizontal</item>
 	</style>
@@ -110,7 +110,7 @@
 
 	<!-- Fn keys (command palette or text-editing palette) -->
 	<style name="TTheme.CommandPalette.Wrapper" parent="">
-		<item name="android:layout_height">@dimen/main_small_key_text_editing_height</item>
+		<item name="android:layout_height">@dimen/main_small_command_palette_height</item>
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:orientation">horizontal</item>
 	</style>
@@ -118,13 +118,13 @@
 	<style name="TTheme.CommandPalette.Key" parent="TTheme.MainSmall.Key">
 		<item name="android:drawablePadding">0dp</item>
 		<item name="android:layout_marginTop">0dp</item>
+		<item name="android:layout_marginRight">1dp</item>
 		<item name="android:layout_marginBottom">0dp</item>
 		<item name="android:layout_marginLeft">1dp</item>
-		<item name="android:layout_marginRight">1dp</item>
 		<item name="android:paddingTop">0dp</item>
+		<item name="android:paddingRight">0dp</item>
 		<item name="android:paddingBottom">2dp</item>
 		<item name="android:paddingLeft">0dp</item>
-		<item name="android:paddingRight">0dp</item>
 
 		<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
 		<item name="android:textSize">@dimen/key_text_size</item>