diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/custom/ScreenPreference.java b/app/src/main/java/io/github/sspanak/tt9/preferences/custom/ScreenPreference.java
index 2105051e..a4a4ddb2 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/custom/ScreenPreference.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/custom/ScreenPreference.java
@@ -45,11 +45,11 @@ abstract public class ScreenPreference extends Preference {
 
 	public static int getLargeLayout(Preference pref) {
 		if (pref instanceof PreferenceCategory) {
-			return R.layout.pref_category;
+			return R.layout.pref_category_large;
 		} else if (pref instanceof SwitchPreferenceCompat) {
 			return R.layout.pref_switch_large;
 		} else if (pref instanceof DropDownPreference) {
-			return R.layout.pref_dropdown;
+			return R.layout.pref_dropdown_large;
 		} else {
 			return R.layout.pref_default_large;
 		}
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
index 2cc6cb66..634886aa 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
@@ -165,7 +165,7 @@ class MainLayoutNumpad extends BaseMainLayout {
 			Resources resources = tt9.getResources();
 			height = getKeyHeightCompat() * 4
 				+ resources.getDimensionPixelSize(R.dimen.numpad_suggestion_height)
-				+ Math.round(resources.getDimension(R.dimen.numpad_padding_bottom))
+				+ Math.round(resources.getDimension(R.dimen.numpad_spacing_bottom))
 				+ getBottomInsetSize();
 		}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java
index 0c3c1729..4ff0be0c 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java
@@ -80,7 +80,7 @@ abstract public class SwipeableKey extends SoftKey {
 		try {
 			// The simpler getResource.getFloat() requires API 29, so we must get the value manually.
 			TypedValue outValue = new TypedValue();
-			getResources().getValue(R.dimen.numpad_function_key_layout_weight, outValue, true);
+			getResources().getValue(R.dimen.numpad_key_fn_layout_weight, outValue, true);
 			float functionKeyScale = outValue.getFloat();
 
 			float keyWidth = tt9.getWidth() / 5f * functionKeyScale;
diff --git a/app/src/main/res/layout/pref_category.xml b/app/src/main/res/layout/pref_category_large.xml
similarity index 66%
rename from app/src/main/res/layout/pref_category.xml
rename to app/src/main/res/layout/pref_category_large.xml
index 5c152b5b..21d8b8d8 100644
--- a/app/src/main/res/layout/pref_category.xml
+++ b/app/src/main/res/layout/pref_category_large.xml
@@ -3,9 +3,9 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingHorizontal="@dimen/pref_large_padding_horizontal"
-	android:paddingTop="@dimen/pref_large_category_padding_top"
-	android:paddingBottom="@dimen/pref_large_category_padding_bottom">
+	android:paddingHorizontal="@dimen/large_pref_spacing_horizontal"
+	android:paddingTop="@dimen/large_pref_category_spacing_top"
+	android:paddingBottom="@dimen/large_pref_category_spacing_bottom">
 
 	<TextView
 		android:id="@android:id/title"
@@ -13,5 +13,5 @@
 		android:layout_height="wrap_content"
 		android:textAppearance="@style/TextAppearance.AppCompat.Title"
 		android:textColor="?attr/colorAccent"
-		android:textSize="@dimen/pref_large_text_size" />
+		android:textSize="@dimen/large_pref_text_size" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_default_large.xml b/app/src/main/res/layout/pref_default_large.xml
index 53e97d71..aadff9b9 100644
--- a/app/src/main/res/layout/pref_default_large.xml
+++ b/app/src/main/res/layout/pref_default_large.xml
@@ -3,18 +3,18 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingHorizontal="@dimen/pref_large_padding_horizontal"
-	android:paddingVertical="@dimen/pref_large_padding_vertical">
+	android:paddingHorizontal="@dimen/large_pref_spacing_horizontal"
+	android:paddingVertical="@dimen/large_pref_spacing_vertical">
 
 		<TextView android:id="@android:id/title"
 			android:layout_height="wrap_content"
 			android:layout_width="wrap_content"
 			android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
-			android:textSize="@dimen/pref_large_text_size" />
+			android:textSize="@dimen/large_pref_text_size" />
 
 		<TextView android:id="@android:id/summary"
 			android:layout_height="wrap_content"
 			android:layout_width="wrap_content"
 			android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-			android:textSize="@dimen/pref_large_summary_size" />
+			android:textSize="@dimen/large_pref_summary_size" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_deletable_word.xml b/app/src/main/res/layout/pref_deletable_word.xml
index 6cb3b247..a3ab21ca 100644
--- a/app/src/main/res/layout/pref_deletable_word.xml
+++ b/app/src/main/res/layout/pref_deletable_word.xml
@@ -5,8 +5,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="horizontal"
-	android:paddingHorizontal="@dimen/pref_padding_horizontal"
-	android:paddingVertical="@dimen/pref_padding_vertical"
+	android:paddingHorizontal="@dimen/pref_custom_spacing_horizontal"
+	android:paddingVertical="@dimen/pref_custom_spacing_vertical"
 	app:layout_anchorGravity="center_horizontal">
 
 	<TextView
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 76f6a5c6..45c8780f 100644
--- a/app/src/main/res/layout/pref_deletable_word_large.xml
+++ b/app/src/main/res/layout/pref_deletable_word_large.xml
@@ -5,8 +5,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="horizontal"
-	android:paddingHorizontal="@dimen/pref_large_padding_horizontal"
-	android:paddingVertical="@dimen/pref_large_padding_vertical"
+	android:paddingHorizontal="@dimen/large_pref_spacing_horizontal"
+	android:paddingVertical="@dimen/large_pref_spacing_vertical"
 	app:layout_anchorGravity="center_horizontal">
 
 	<TextView
@@ -23,6 +23,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
-		android:textSize="@dimen/pref_large_text_size"
+		android:textSize="@dimen/large_pref_text_size"
 		tools:text="Lorem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_dropdown.xml b/app/src/main/res/layout/pref_dropdown_large.xml
similarity index 81%
rename from app/src/main/res/layout/pref_dropdown.xml
rename to app/src/main/res/layout/pref_dropdown_large.xml
index 5a299bd0..c70f4400 100644
--- a/app/src/main/res/layout/pref_dropdown.xml
+++ b/app/src/main/res/layout/pref_dropdown_large.xml
@@ -4,8 +4,8 @@
 	android:layout_height="wrap_content"
 	android:baselineAligned="false"
 	android:orientation="horizontal"
-	android:paddingHorizontal="@dimen/pref_large_padding_horizontal"
-	android:paddingVertical="@dimen/pref_large_padding_vertical">
+	android:paddingHorizontal="@dimen/large_pref_spacing_horizontal"
+	android:paddingVertical="@dimen/large_pref_spacing_vertical">
 
 	<androidx.appcompat.widget.AppCompatSpinner
 		android:id="@+id/spinner"
@@ -24,14 +24,14 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
-			android:textSize="@dimen/pref_large_text_size" />
+			android:textSize="@dimen/large_pref_text_size" />
 
 		<TextView
 			android:id="@android:id/summary"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-			android:textSize="@dimen/pref_large_summary_size" />
+			android:textSize="@dimen/large_pref_summary_size" />
 	</LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_input_text.xml b/app/src/main/res/layout/pref_input_text.xml
index cfcc49bb..858b9d70 100644
--- a/app/src/main/res/layout/pref_input_text.xml
+++ b/app/src/main/res/layout/pref_input_text.xml
@@ -4,8 +4,8 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingHorizontal="@dimen/pref_padding_horizontal"
-	android:paddingVertical="@dimen/pref_padding_vertical">
+	android:paddingHorizontal="@dimen/pref_custom_spacing_horizontal"
+	android:paddingVertical="@dimen/pref_custom_spacing_vertical">
 
 	<TextView
 		android:id="@android:id/title"
@@ -22,7 +22,7 @@
 		android:focusableInTouchMode="true"
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
-		android:minHeight="@dimen/preferences_text_min_height"
+		android:minHeight="@dimen/pref_custom_min_height"
 		android:singleLine="true"
 		android:imeOptions="actionNone" />
 
diff --git a/app/src/main/res/layout/pref_input_text_large.xml b/app/src/main/res/layout/pref_input_text_large.xml
index 566725b3..7528f3f1 100644
--- a/app/src/main/res/layout/pref_input_text_large.xml
+++ b/app/src/main/res/layout/pref_input_text_large.xml
@@ -4,8 +4,8 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingHorizontal="@dimen/pref_large_padding_horizontal"
-	android:paddingVertical="@dimen/pref_large_padding_vertical">
+	android:paddingHorizontal="@dimen/large_pref_spacing_horizontal"
+	android:paddingVertical="@dimen/large_pref_spacing_vertical">
 
 	<TextView
 		android:id="@android:id/title"
@@ -13,7 +13,7 @@
 		android:layout_height="wrap_content"
 		android:labelFor="@id/input_text_input_field"
 		android:text="?android:title"
-		android:textSize="@dimen/pref_large_summary_size"/>
+		android:textSize="@dimen/large_pref_summary_size"/>
 
 	<EditText
 		android:id="@+id/input_text_input_field"
@@ -23,13 +23,13 @@
 		android:focusableInTouchMode="true"
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
-		android:minHeight="@dimen/preferences_text_min_height"
-		android:textSize="@dimen/pref_large_text_size" />
+		android:minHeight="@dimen/pref_custom_min_height"
+		android:textSize="@dimen/large_pref_text_size" />
 
 	<TextView android:id="@android:id/summary"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-		android:textSize="@dimen/pref_large_summary_size" />
+		android:textSize="@dimen/large_pref_summary_size" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_plain_text.xml b/app/src/main/res/layout/pref_plain_text.xml
index 9db4620e..c93ee833 100644
--- a/app/src/main/res/layout/pref_plain_text.xml
+++ b/app/src/main/res/layout/pref_plain_text.xml
@@ -3,12 +3,12 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingHorizontal="@dimen/pref_padding_horizontal"
-	android:paddingVertical="@dimen/pref_padding_vertical">
+	android:paddingHorizontal="@dimen/pref_custom_spacing_horizontal"
+	android:paddingVertical="@dimen/pref_custom_spacing_vertical">
 
 		<TextView
 			android:id="@android:id/summary"
 			android:layout_height="wrap_content"
 			android:layout_width="wrap_content"
-			android:minHeight="@dimen/preferences_text_min_height" />
+			android:minHeight="@dimen/pref_custom_min_height" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_plain_text_large.xml b/app/src/main/res/layout/pref_plain_text_large.xml
index b1783bf1..34dca9eb 100644
--- a/app/src/main/res/layout/pref_plain_text_large.xml
+++ b/app/src/main/res/layout/pref_plain_text_large.xml
@@ -3,13 +3,13 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingHorizontal="@dimen/pref_large_padding_horizontal"
-	android:paddingVertical="@dimen/pref_large_padding_vertical">
+	android:paddingHorizontal="@dimen/large_pref_spacing_horizontal"
+	android:paddingVertical="@dimen/large_pref_spacing_vertical">
 
 		<TextView
 			android:id="@android:id/summary"
 			android:layout_height="wrap_content"
 			android:layout_width="wrap_content"
-			android:minHeight="@dimen/preferences_text_min_height"
-			android:textSize="@dimen/pref_large_summary_size" />
+			android:minHeight="@dimen/pref_custom_min_height"
+			android:textSize="@dimen/large_pref_summary_size" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_search_v31.xml b/app/src/main/res/layout/pref_search_v31.xml
index f428336a..09d4b71b 100644
--- a/app/src/main/res/layout/pref_search_v31.xml
+++ b/app/src/main/res/layout/pref_search_v31.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/preference_search_height">
+	android:layout_height="@dimen/pref_search_height">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/pref_switch_large.xml b/app/src/main/res/layout/pref_switch_large.xml
index c516ebba..48ded958 100644
--- a/app/src/main/res/layout/pref_switch_large.xml
+++ b/app/src/main/res/layout/pref_switch_large.xml
@@ -10,24 +10,24 @@
 		android:layout_weight="3"
 		android:gravity="start|center_vertical"
 		android:orientation="vertical"
-		android:paddingStart="@dimen/pref_large_padding_horizontal"
-		android:paddingTop="@dimen/pref_large_padding_vertical"
+		android:paddingStart="@dimen/large_pref_spacing_horizontal"
+		android:paddingTop="@dimen/large_pref_spacing_vertical"
 		android:paddingEnd="4dp"
-		android:paddingBottom="@dimen/pref_large_padding_vertical">
+		android:paddingBottom="@dimen/large_pref_spacing_vertical">
 
 		<TextView
 			android:id="@android:id/title"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
-			android:textSize="@dimen/pref_large_text_size" />
+			android:textSize="@dimen/large_pref_text_size" />
 
 		<TextView
 			android:id="@android:id/summary"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-			android:textSize="@dimen/pref_large_summary_size" />
+			android:textSize="@dimen/large_pref_summary_size" />
 	</LinearLayout>
 
 	<androidx.appcompat.widget.SwitchCompat
@@ -37,5 +37,5 @@
 		android:layout_weight="1"
 		android:gravity="end|center_vertical"
 		android:paddingStart="2dp"
-		android:paddingEnd="@dimen/pref_large_padding_horizontal" />
+		android:paddingEnd="@dimen/large_pref_spacing_horizontal" />
 </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8473fd36..79d13e9d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,7 +13,7 @@
 	<dimen name="status_bar_text_size">16sp</dimen>
 
 	<!-- Main Small -->
-	<dimen name="main_small_suggestion_padding_horizontal">6sp</dimen>
+	<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>
@@ -21,32 +21,40 @@
 	<dimen name="main_small_key_wrapper_height">46dp</dimen> <!-- key height + margin -->
 
 	<!-- Preferences, default font size -->
-	<dimen name="preferences_text_min_height">48dp</dimen>
-	<dimen name="preference_search_height">72dp</dimen>
-	<dimen name="pref_padding_horizontal">16dp</dimen>
-	<dimen name="pref_padding_vertical">12dp</dimen>
+	<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_search_height">72dp</dimen>
 
 	<!-- Preferences, large font size -->
-	<dimen name="pref_large_category_padding_top">30dp</dimen>
-	<dimen name="pref_large_category_padding_bottom">12dp</dimen>
-	<dimen name="pref_large_padding_horizontal">16dp</dimen>
-	<dimen name="pref_large_padding_vertical">18dp</dimen>
-	<dimen name="pref_large_text_size">22sp</dimen>
-	<dimen name="pref_large_summary_size">19sp</dimen>
+	<dimen name="large_pref_category_spacing_top">30dp</dimen>
+	<dimen name="large_pref_category_spacing_bottom">12dp</dimen>
+
+	<dimen name="large_pref_spacing_horizontal">16dp</dimen>
+	<dimen name="large_pref_spacing_vertical">18dp</dimen>
+	<dimen name="large_pref_text_size">22sp</dimen>
+	<dimen name="large_pref_summary_size">19sp</dimen>
 
 
 	<!-- Numpad -->
 	<dimen name="numpad_max_width">9999dp</dimen>
-	<dimen name="numpad_padding_bottom">6dp</dimen>
+	<dimen name="numpad_spacing_bottom">6dp</dimen>
 
 	<dimen name="numpad_key_height">56dp</dimen>
-	<dimen name="numpad_arrow_key_width">38dp</dimen>
-	<dimen name="numpad_function_key_layout_weight">0.675</dimen>
+	<dimen name="numpad_key_spacing">3dp</dimen>
+	<dimen name="numpad_key_arrow_width">38dp</dimen>
+	<dimen name="numpad_key_fn_layout_weight">0.675</dimen>
 
 	<dimen name="numpad_key_overlay_z">666dp</dimen>
-	<dimen name="numpad_key_overlay_small_icon_size">13dp</dimen>
-	<dimen name="numpad_key_overlay_text_size">11dp</dimen>
-	<dimen name="numpad_key_overlay_side_text_margin">2dp</dimen>
+	<dimen name="numpad_key_overlay_side_text_size">9dp</dimen>
+	<dimen name="numpad_key_overlay_hold_icon_size">13dp</dimen>
+	<dimen name="numpad_key_overlay_hold_text_size">11dp</dimen>
+
+	<dimen name="numpad_key_overlay_side_text_spacing">2dp</dimen>
+	<dimen name="numpad_key_overlay_hold_icon_spacing_top">4dp</dimen>
+	<dimen name="numpad_key_overlay_hold_icon_spacing_right">3dp</dimen>
+	<dimen name="numpad_key_overlay_hold_text_spacing_top">3dp</dimen>
+	<dimen name="numpad_key_overlay_hold_text_spacing_right">5dp</dimen>
 
 	<dimen name="numpad_suggestion_font_size">17sp</dimen>
 	<dimen name="numpad_suggestion_height">40sp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ff0adb02..d4b78d32 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,8 +60,8 @@
 		<item name="android:gravity">center</item>
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">match_parent</item>
-		<item name="android:paddingLeft">@dimen/main_small_suggestion_padding_horizontal</item>
-		<item name="android:paddingRight">@dimen/main_small_suggestion_padding_horizontal</item>
+		<item name="android:paddingLeft">@dimen/main_small_suggestion_spacing_horizontal</item>
+		<item name="android:paddingRight">@dimen/main_small_suggestion_spacing_horizontal</item>
 
 		<!--
 		for some reason the RecyclerView displays the text smaller than the TextView,
@@ -162,7 +162,7 @@
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_width">0dp</item>
 		<item name="android:orientation">vertical</item>
-		<item name="android:paddingBottom">@dimen/numpad_padding_bottom</item>
+		<item name="android:paddingBottom">@dimen/numpad_spacing_bottom</item>
 	</style>
 
 
@@ -181,8 +181,8 @@
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:minWidth">@dimen/numpad_suggestion_min_width</item>
-		<item name="android:paddingLeft">@dimen/main_small_suggestion_padding_horizontal</item>
-		<item name="android:paddingRight">@dimen/main_small_suggestion_padding_horizontal</item>
+		<item name="android:paddingLeft">@dimen/main_small_suggestion_spacing_horizontal</item>
+		<item name="android:paddingRight">@dimen/main_small_suggestion_spacing_horizontal</item>
 
 		<item name="android:textSize">@dimen/numpad_suggestion_font_size</item>
 	</style>
@@ -200,7 +200,7 @@
 	</style>
 
 	<style name="TTheme.Numpad.Column.Fn" parent="TTheme.Numpad.Column">
-		<item name="android:layout_weight">@dimen/numpad_function_key_layout_weight</item>
+		<item name="android:layout_weight">@dimen/numpad_key_fn_layout_weight</item>
 	</style>
 
 
@@ -235,26 +235,30 @@
 	<!-- Overlay: Hold Icon -->
 	<style name="TTheme.Numpad.Key.Overlay.HoldIcon.Wrapper" parent="TTheme.Numpad.Key.Overlay.Element">
 		<item name="android:gravity">top|right</item>
-		<item name="android:paddingRight">3dp</item>
-		<item name="android:paddingTop">7dp</item>
+		<item name="android:paddingTop">@dimen/numpad_key_overlay_hold_icon_spacing_top</item>
+		<item name="android:paddingRight">@dimen/numpad_key_overlay_hold_icon_spacing_right</item>
 	</style>
 
 	<style name="TTheme.Numpad.Key.Overlay.HoldIcon" parent="TTheme.Numpad.Key.Overlay.Element">
-		<item name="android:layout_height">@dimen/numpad_key_overlay_small_icon_size</item>
-		<item name="android:layout_width">@dimen/numpad_key_overlay_small_icon_size</item>
+		<item name="android:layout_height">@dimen/numpad_key_overlay_hold_icon_size</item>
+		<item name="android:layout_width">@dimen/numpad_key_overlay_hold_icon_size</item>
 
 		<item name="android:tint">@color/key_fn_alternative_color</item>
 	</style>
 
 	<!-- Overlay: Hold Text -->
 	<style name="TTheme.Numpad.Key.Overlay.Text" parent="TTheme.Numpad.Key.Overlay.Element">
-		<item name="android:textSize">@dimen/numpad_key_overlay_text_size</item>
+		<item name="android:textSize">@dimen/numpad_key_overlay_side_text_size</item>
 		<item name="android:textColor">@color/key_fn_alternative_color</item>
 	</style>
 
 	<style name="TTheme.Numpad.Key.Overlay.Text.Hold" parent="TTheme.Numpad.Key.Overlay.Text">
 		<item name="android:gravity">top|right</item>
-		<item name="android:layout_margin">5dp</item>
+		<item name="android:layout_marginTop">@dimen/numpad_key_overlay_hold_text_spacing_top</item>
+		<item name="android:layout_marginRight">@dimen/numpad_key_overlay_hold_text_spacing_right</item>
+		<item name="android:layout_marginBottom">@dimen/numpad_key_overlay_hold_text_spacing_top</item>
+		<item name="android:layout_marginLeft">@dimen/numpad_key_overlay_hold_text_spacing_right</item>
+		<item name="android:textSize">@dimen/numpad_key_overlay_hold_text_size</item>
 	</style>
 
 	<style name="TTheme.Numpad.Key.Number.Overlay.Text.Hold" parent="TTheme.Numpad.Key.Overlay.Text.Hold">
@@ -264,22 +268,22 @@
 	<!-- Overlay: Side Text -->
 	<style name="TTheme.Numpad.Key.Overlay.Text.Top" parent="TTheme.Numpad.Key.Overlay.Text">
 		<item name="android:gravity">top|center</item>
-		<item name="android:layout_marginTop">@dimen/numpad_key_overlay_side_text_margin</item>
+		<item name="android:layout_marginTop">@dimen/numpad_key_overlay_side_text_spacing</item>
 	</style>
 
 	<style name="TTheme.Numpad.Key.Overlay.Text.Right" parent="TTheme.Numpad.Key.Overlay.Text">
 		<item name="android:gravity">center|right</item>
-		<item name="android:layout_marginRight">@dimen/numpad_key_overlay_side_text_margin</item>
+		<item name="android:layout_marginRight">@dimen/numpad_key_overlay_side_text_spacing</item>
 	</style>
 
 	<style name="TTheme.Numpad.Key.Overlay.Text.Bottom" parent="TTheme.Numpad.Key.Overlay.Text">
 		<item name="android:gravity">bottom|center</item>
-		<item name="android:layout_marginBottom">@dimen/numpad_key_overlay_side_text_margin</item>
+		<item name="android:layout_marginBottom">@dimen/numpad_key_overlay_side_text_spacing</item>
 	</style>
 
 	<style name="TTheme.Numpad.Key.Overlay.Text.Left" parent="TTheme.Numpad.Key.Overlay.Text">
 		<item name="android:gravity">center|left</item>
-		<item name="android:layout_marginLeft">@dimen/numpad_key_overlay_side_text_margin</item>
+		<item name="android:layout_marginLeft">@dimen/numpad_key_overlay_side_text_spacing</item>
 	</style>
 
 
@@ -289,8 +293,12 @@
 	<style name="TTheme.Numpad.Key" parent="Widget.MaterialComponents.Button">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">@dimen/numpad_key_height</item>
-		<item name="android:layout_marginLeft">3dp</item>
-		<item name="android:layout_marginRight">3dp</item>
+
+		<!-- reset the spacing and apply our own -->
+		<item name="android:insetTop">@dimen/numpad_key_spacing</item>
+		<item name="android:insetBottom">@dimen/numpad_key_spacing</item>
+		<item name="android:layout_marginLeft">@dimen/numpad_key_spacing</item>
+		<item name="android:layout_marginRight">@dimen/numpad_key_spacing</item>
 		<item name="android:padding">0dp</item>
 
 		<item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
@@ -303,8 +311,7 @@
 	<!-- Suggestion arrow keys -->
 	<style name="TTheme.Numpad.Key.Arrow" parent="TTheme.Numpad.Key">
 		<item name="android:layout_height">match_parent</item>
-		<item name="android:layout_width">@dimen/numpad_arrow_key_width</item>
-		<item name="android:padding">0dp</item>
+		<item name="android:layout_width">@dimen/numpad_key_arrow_width</item>
 	</style>
 
 	<!-- Keypad keys -->
@@ -319,9 +326,9 @@
 	</style>
 
 	<style name="TTheme.Numpad.Key.Placeholder">
-		<item name="android:layout_height">0dp</item>
-		<item name="android:layout_width">0dp</item>
-		<item name="android:layout_weight">1</item>
+		<item name="android:layout_height">@dimen/numpad_key_height</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_margin">@dimen/numpad_key_spacing</item>
 	</style>
 
 </resources>