diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java
index 66e11a51..e6ceebab 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java
@@ -115,7 +115,6 @@ public class SettingsUI extends SettingsTyping {
 	}
 
 	public boolean isNumpadShapeLongSpace() { return getNumpadShape() == NUMPAD_SHAPE_LONG_SPACE; }
-	public boolean isNumpadShapeSquare() { return getNumpadShape() == NUMPAD_SHAPE_SQUARE; }
 	public boolean isNumpadShapeV() { return getNumpadShape() == NUMPAD_SHAPE_V; }
 
 	public int getSettingsFontSize() {
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java
index 6db532d6..ee8729ba 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java
@@ -75,13 +75,14 @@ abstract class BaseMainLayout {
 	protected WindowInsets preventEdgeToEdge(@NonNull View v, @NonNull WindowInsets windowInsets) {
 		Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
 		ViewGroup.MarginLayoutParams layout = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-		if (layout != null) {
-			layout.rightMargin = insets.right;
-			layout.bottomMargin = insets.bottom;
-			layout.leftMargin = insets.left;
-			v.setLayoutParams(layout);
+		if (layout == null) {
+			return windowInsets;
 		}
 
+		layout.rightMargin = insets.right;
+		layout.bottomMargin = insets.bottom;
+		layout.leftMargin = insets.left;
+		v.setLayoutParams(layout);
 		return WindowInsets.CONSUMED;
 	}
 
diff --git a/app/src/main/res/layout/key_overlay_hold_text.xml b/app/src/main/res/layout/key_overlay_hold_text.xml
deleted file mode 100644
index 972f8e80..00000000
--- a/app/src/main/res/layout/key_overlay_hold_text.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<TextView style="@style/TTheme.Numpad.Key.Overlay.Text.Hold" android:tag="overlay_hold_text" />
-</merge>
diff --git a/app/src/main/res/layout/panel_numpad_right.xml b/app/src/main/res/layout/panel_numpad_right.xml
index 32fadb4a..ddb72570 100644
--- a/app/src/main/res/layout/panel_numpad_right.xml
+++ b/app/src/main/res/layout/panel_numpad_right.xml
@@ -19,7 +19,7 @@
 		<io.github.sspanak.tt9.ui.main.keys.SoftKeyRF3
 			style="@style/TTheme.Numpad.Key.Large"
 			android:id="@+id/soft_key_rf3" />
-		<include layout="@layout/key_overlay_icons" />
+		<include layout="@layout/key_overlay_lf4" />
 	</RelativeLayout>
 
 	<io.github.sspanak.tt9.ui.main.keys.SoftKeyOk