diff --git a/res/layout/mainview.xml b/res/layout/mainview_small.xml
similarity index 98%
rename from res/layout/mainview.xml
rename to res/layout/mainview_small.xml
index 4ad10f7f7..89d37cff1 100644
--- a/res/layout/mainview.xml
+++ b/res/layout/mainview_small.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/mainview_small"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
diff --git a/res/layout/mainview_with_numpad.xml b/res/layout/mainview_with_numpad.xml
new file mode 100644
index 000000000..95ef54e9b
--- /dev/null
+++ b/res/layout/mainview_with_numpad.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/mainview_with_numpad"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/main_suggestions_list"
+		android:layout_width="fill_parent"
+		android:layout_height="@dimen/candidate_list_height"
+		android:fadingEdge="horizontal"
+		android:orientation="horizontal"
+		android:paddingTop="1px"
+		android:scrollbars="none" />
+
+
+	<TableLayout
+		android:id="@+id/main_soft_keys"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			tools:ignore="HardcodedText,KeyboardInaccessibleWidget" >
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_1"
+				android:text="1"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_2"
+				android:text="2"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_3"
+				android:text="3"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<Button
+				android:id="@+id/main_right"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:clickable="true"
+				android:focusable="true"
+				android:longClickable="true"
+				android:text="⌫"
+				android:textSize="@dimen/soft_key_icon_size"
+				tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />
+		</TableRow>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			tools:ignore="HardcodedText,KeyboardInaccessibleWidget" >
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_4"
+				android:text="4"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_5"
+				android:text="5"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_6"
+				android:text="6"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<Button
+				android:id="@+id/main_mid"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:clickable="true"
+				android:focusable="true"
+				android:longClickable="true"
+				android:text="@android:string/ok"
+				tools:ignore="ButtonOrder,KeyboardInaccessibleWidget" />
+		</TableRow>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			tools:ignore="HardcodedText,KeyboardInaccessibleWidget" >
+			<!--			android:textSize="@dimen/soft_key_icon_size"-->
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_7"
+				android:text="7"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_8"
+				android:text="8"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_9"
+				android:text="9"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<Button
+				android:id="@+id/soft_language"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:text="🪐"
+				android:textSize="@dimen/soft_key_icon_size"
+				tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />
+		</TableRow>
+
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			tools:ignore="HardcodedText,KeyboardInaccessibleWidget" >
+			<Button
+				android:id="@+id/soft_addWord"
+				android:text="++"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<io.github.sspanak.tt9.ui.NumpadButton
+				android:id="@+id/soft_0"
+				android:text="0"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<Button
+				android:id="@+id/soft_mode"
+				android:text="⇄"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:textSize="@dimen/soft_key_icon_size"/>
+			<Button
+				android:id="@+id/main_left"
+				style="@android:style/Widget.Holo.Button.Borderless"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:clickable="true"
+				android:focusable="true"
+				android:longClickable="true"
+				android:text="⚙"
+				android:textSize="@dimen/soft_key_icon_size"
+				tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />
+		</TableRow>
+	</TableLayout>
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 15ca62fe1..8cc9d31dd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,6 +29,11 @@
 	<string name="pref_dark_theme">Dark Theme</string>
 	<string name="pref_double_zero_char">Character for Double 0-key Press</string>
 	<string name="pref_show_soft_function_keys">Show On-Screen Keys</string>
+	<string name="pref_show_soft_numpad">Full On-Screen Keyboard</string>
+	<string name="pref_show_soft_numpad_summary_on">Numpad is shown</string>
+	<string name="pref_show_soft_numpad_summary_off">Numpad is not shown. Only main buttons.</string>
+	<string name="pref_dpad_softkeys_navigation">Dpad navigation on soft keys</string>
+	<string name="pref_dpad_softkeys_navigation_summary">Use Dpad Keys to navigate over On-Screen Keys. DPad_Down is used to change in navigation mode. This setting only effects non-touch displays.</string>
 	<string name="pref_help">Help</string>
 	<string name="pref_upside_down_keys">Reverse Key Order</string>
 	<string name="pref_upside_down_keys_summary">Use this if you have 7–8–9 on the first row, instead of 1–2–3.</string>
diff --git a/res/xml/prefs_screen_appearance.xml b/res/xml/prefs_screen_appearance.xml
index a0ed12829..6393694f9 100644
--- a/res/xml/prefs_screen_appearance.xml
+++ b/res/xml/prefs_screen_appearance.xml
@@ -13,4 +13,21 @@
 		app:layout="@layout/pref_switch"
 		app:title="@string/pref_show_soft_function_keys" />
 
+	<SwitchPreferenceCompat
+		app:defaultValue="false"
+		app:key="pref_show_soft_numpad"
+		app:layout="@layout/pref_switch"
+		app:title="@string/pref_show_soft_numpad"
+		app:summaryOn="@string/pref_show_soft_numpad_summary_on"
+		app:summaryOff="@string/pref_show_soft_numpad_summary_off"
+		app:dependency="pref_show_soft_keys" />
+
+	<SwitchPreferenceCompat
+		app:defaultValue="false"
+		app:key="pref_dpad_softkeys_navigation"
+		app:layout="@layout/pref_switch"
+		app:title="@string/pref_dpad_softkeys_navigation"
+		app:summary="@string/pref_dpad_softkeys_navigation_summary"
+		app:dependency="pref_show_soft_keys"/>
+
 </PreferenceScreen>
diff --git a/src/io/github/sspanak/tt9/ime/KeyPadHandler.java b/src/io/github/sspanak/tt9/ime/KeyPadHandler.java
index 3d1b1e7d0..475eccd9f 100644
--- a/src/io/github/sspanak/tt9/ime/KeyPadHandler.java
+++ b/src/io/github/sspanak/tt9/ime/KeyPadHandler.java
@@ -255,7 +255,11 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
 		}
 
 		if (Key.isOK(keyCode)) {
-			return onOK();
+			if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER && onDpad(keyCode)){
+				return true;
+			}else {
+				return onOK();
+			}
 		}
 
 		if (Key.isNumber(keyCode)) {
@@ -263,10 +267,10 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
 		}
 
 		switch (keyCode) {
-			case KeyEvent.KEYCODE_DPAD_UP: return onUp();
-			case KeyEvent.KEYCODE_DPAD_DOWN: return onDown();
-			case KeyEvent.KEYCODE_DPAD_LEFT: return onLeft();
-			case KeyEvent.KEYCODE_DPAD_RIGHT: return onRight(keyRepeatCounter > 0);
+			case KeyEvent.KEYCODE_DPAD_UP:
+			case KeyEvent.KEYCODE_DPAD_DOWN:
+			case KeyEvent.KEYCODE_DPAD_LEFT:
+			case KeyEvent.KEYCODE_DPAD_RIGHT: return onDpad(keyCode);
 			case KeyEvent.KEYCODE_STAR: return onStar();
 			case KeyEvent.KEYCODE_POUND: return onPound();
 		}
@@ -274,6 +278,17 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
 		return false;
 	}
 
+	protected boolean onDpad(int keyCode){
+		switch (keyCode) {
+			case KeyEvent.KEYCODE_DPAD_UP: return onUp();
+			case KeyEvent.KEYCODE_DPAD_DOWN: return onDown();
+			case KeyEvent.KEYCODE_DPAD_LEFT: return onLeft();
+			case KeyEvent.KEYCODE_DPAD_RIGHT: return onRight(keyRepeatCounter > 0);
+			case KeyEvent.KEYCODE_DPAD_CENTER: return false;
+			default: throw new RuntimeException("KeypadHandler - unsupported dpad key code");
+		}
+	}
+
 
 	private boolean handleHotkey(int keyCode, boolean hold) {
 		if (keyCode == settings.getKeyAddWord() * (hold ? -1 : 1)) {
diff --git a/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java b/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java
index 1705739d7..124c082f6 100644
--- a/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java
+++ b/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java
@@ -1,37 +1,92 @@
 package io.github.sspanak.tt9.ime;
 
 import android.graphics.drawable.Drawable;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.LinearLayout;
 
-import androidx.core.content.ContextCompat;
+import java.util.HashSet;
 
+import androidx.core.content.ContextCompat;
 import io.github.sspanak.tt9.R;
+import io.github.sspanak.tt9.preferences.SettingsStore;
+import io.github.sspanak.tt9.ui.NumpadButton;
 import io.github.sspanak.tt9.ui.UI;
 
-class SoftKeyHandler implements View.OnTouchListener {
-	private static final int[] buttons = { R.id.main_left, R.id.main_mid, R.id.main_right };
+class SoftKeyHandler implements View.OnClickListener {
+	private static final int[] buttons = { R.id.main_left, R.id.main_mid, R.id.main_right, R.id.soft_mode, R.id.soft_language, R.id.soft_addWord };
+	private HashSet<NumpadButton> buttons_number = new HashSet<>();
 	private final TraditionalT9 tt9;
 	private View view = null;
-
+	protected SettingsStore settings;
 	private long lastBackspaceCall = 0;
 
 	public SoftKeyHandler(TraditionalT9 tt9) {
 		this.tt9 = tt9;
 
+		settings = new SettingsStore(tt9.getApplicationContext());
 		getView();
 	}
 
 
 	View getView() {
+		if (view != null){
+			//check whether mainview setting has changed
+			boolean prefShowNumpad = settings.getShowSoftNumpad();
+			if ((view.getId() == R.id.mainview_small && prefShowNumpad) ||
+					(view.getId() == R.id.mainview_with_numpad && !prefShowNumpad)){
+				view = null;
+			}
+		}
+
 		if (view == null) {
-			view = View.inflate(tt9.getApplicationContext(), R.layout.mainview, null);
+			if (settings.getShowSoftNumpad()){
+				view = View.inflate(tt9.getApplicationContext(), R.layout.mainview_with_numpad, null);
+			}else{
+				view = View.inflate(tt9.getApplicationContext(), R.layout.mainview_small, null);
+			}
 
 			for (int buttonId : buttons) {
-				view.findViewById(buttonId).setOnTouchListener(this);
+				View button = view.findViewById(buttonId);
+				if (button == null){
+					continue; //as this button is only in numpad mainview included
+				}
+				button.setOnClickListener(this);
+
+				if (buttonId == R.id.main_right){
+					//implement holding / moving with finger on back button for deleting letters
+					button.setOnTouchListener(new View.OnTouchListener() {
+						@Override
+						public boolean onTouch(View view, MotionEvent motionEvent) {
+							if (motionEvent.getAction() == MotionEvent.AXIS_PRESSURE) {
+								return handleBackspaceHold();
+							}
+							return false;
+						}
+					});
+				}
+			}
+
+
+			ViewGroup softNumpad = view.findViewById(R.id.main_soft_keys);
+			for (int r = 0; r < softNumpad.getChildCount(); r++) {
+				View child = softNumpad.getChildAt(r);
+				if (child instanceof ViewGroup) {
+					//this happens only if R.layout.mainview_with_numpad is inflated
+					ViewGroup row = (ViewGroup) child;
+					for (int b = 0; b < row.getChildCount(); b++) {
+						View button = row.getChildAt(b);
+						if (button instanceof NumpadButton) {
+							NumpadButton nb = (NumpadButton) button;
+							buttons_number.add(nb);
+							nb.setIMS(tt9);
+						}
+					}
+				}
 			}
+			tt9.setInputView(view);
 		}
 
 		return view;
@@ -39,8 +94,22 @@ View getView() {
 
 
 	void show() {
+		//First call getView to force an update of the view in case settings have changed.
+		//Does nothing, if nothing has changed.
+		getView();
+
 		if (view != null) {
 			view.setVisibility(View.VISIBLE);
+			invalidateNumpadButtonsText();
+		}
+	}
+
+	/**
+	 * calls {@link NumpadButton#invalidateText} for all Numpad Buttons.
+	 */
+	void invalidateNumpadButtonsText(){
+		for (NumpadButton nb: buttons_number){
+			nb.invalidateText(tt9.mLanguage);
 		}
 	}
 
@@ -54,7 +123,7 @@ void hide() {
 
 	void setSoftKeysVisibility(boolean visible) {
 		if (view != null) {
-			view.findViewById(R.id.main_soft_keys).setVisibility(visible ? LinearLayout.VISIBLE : LinearLayout.GONE);
+			view.findViewById(R.id.main_soft_keys).setVisibility(visible ? View.VISIBLE : View.GONE);
 		}
 	}
 
@@ -88,6 +157,9 @@ void setDarkTheme(boolean darkEnabled) {
 
 		for (int buttonId : buttons) {
 			Button button = view.findViewById(buttonId);
+			if (button == null){
+				continue; //as this button is only in numpad mainview included
+			}
 			button.setTextColor(textColor);
 		}
 
@@ -97,8 +169,8 @@ void setDarkTheme(boolean darkEnabled) {
 			darkEnabled ? R.drawable.button_separator_dark : R.drawable.button_separator
 		);
 
-		view.findViewById(R.id.main_separator_left).setBackground(separatorColor);
-		view.findViewById(R.id.main_separator_right).setBackground(separatorColor);
+//		view.findViewById(R.id.main_separator_left).setBackground(separatorColor);
+//		view.findViewById(R.id.main_separator_right).setBackground(separatorColor);
 	}
 
 
@@ -118,33 +190,68 @@ private boolean handleBackspaceHold() {
 
 	private boolean handleBackspaceUp() {
 		lastBackspaceCall = 0;
+		invalidateNumpadButtonsText();
 		return true;
 	}
 
+	public boolean handleDpadNavigation(int keyCode){
+		if (!settings.getDpadSoftkeysNavigation()){
+			return false;
+		}
+		View focusedView = view.findFocus();
+		if ((focusedView == null || focusedView.getId() == R.id.main_suggestions_list)
+				&& keyCode == KeyEvent.KEYCODE_DPAD_DOWN){
+			Button settingsButton = view.findViewById(R.id.main_left);
+			//Kept as a reference if someone wants to debug dpad navigation on a touch-screen device
+			//settingsButton.setFocusableInTouchMode(true); // only for debugging (also in NumpadButton.java)
+			return settingsButton.requestFocus();
+		}else if(focusedView != null && focusedView.getId() != R.id.main_suggestions_list){
+			int direction;
+			switch (keyCode){
+				case KeyEvent.KEYCODE_DPAD_UP: direction = View.FOCUS_UP; break;
+				case KeyEvent.KEYCODE_DPAD_DOWN: direction = View.FOCUS_DOWN; break;
+				case KeyEvent.KEYCODE_DPAD_LEFT: direction = View.FOCUS_LEFT; break;
+				case KeyEvent.KEYCODE_DPAD_RIGHT: direction = View.FOCUS_RIGHT; break;
+				case KeyEvent.KEYCODE_DPAD_CENTER: return focusedView.performClick();
+				default: throw new RuntimeException("Unsupported dpad key code");
+			}
+			View nextFocused = focusedView.focusSearch(direction);
+			if (nextFocused != null){
+				nextFocused.requestFocus();
+			}
+			return true;
+		}
+
+		return false;
+	}
+
 
 	@Override
-	public boolean onTouch(View view, MotionEvent event) {
-		int action = event.getAction();
+	public void onClick(View view) {
 		int buttonId = view.getId();
 
-		if (buttonId == R.id.main_left && action == MotionEvent.ACTION_UP) {
+		if (buttonId == R.id.main_left) {
 			UI.showSettingsScreen(tt9);
-			return view.performClick();
 		}
 
-		if (buttonId == R.id.main_mid && action == MotionEvent.ACTION_UP) {
+		if (buttonId == R.id.main_mid) {
 			tt9.onOK();
-			return view.performClick();
+			invalidateNumpadButtonsText();
+		}
+		if (buttonId == R.id.soft_mode) {
+			tt9.onKeyNextInputMode();
+			invalidateNumpadButtonsText();
+		}
+		if (buttonId == R.id.soft_addWord) {
+			tt9.onKeyAddWord();
+		}
+		if (buttonId == R.id.soft_language) {
+			tt9.onKeyNextLanguage();
+			invalidateNumpadButtonsText();
 		}
-
 		if (buttonId == R.id.main_right) {
-			if (action == MotionEvent.AXIS_PRESSURE) {
-				return handleBackspaceHold();
-			} else if (action == MotionEvent.ACTION_UP) {
-				return handleBackspaceUp();
-			}
+			handleBackspaceUp();
 		}
 
-		return false;
 	}
 }
diff --git a/src/io/github/sspanak/tt9/ime/TraditionalT9.java b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
index e93a4712b..89496b30f 100644
--- a/src/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -82,7 +82,7 @@ protected void onInit() {
 		}
 
 		if (mSuggestionView == null) {
-			mSuggestionView = new SuggestionsView(settings, softKeyHandler.getView());
+			mSuggestionView = new SuggestionsView(settings, softKeyHandler.getView(), this);
 		}
 
 		loadSettings();
@@ -310,6 +310,14 @@ protected boolean onNumber(int key, boolean hold, int repeat) {
 		return true;
 	}
 
+	@Override
+	protected boolean onDpad(int keyCode) {
+		//check whether dpad shall be handled as focus changed to soft keyboard
+		if (softKeyHandler.handleDpadNavigation(keyCode)){
+			return true;
+		}
+		return super.onDpad(keyCode);
+	}
 
 	protected boolean onPound() {
 		textField.setText("#");
@@ -490,6 +498,9 @@ private void refreshComposingText() {
 		textField.setComposingText(getComposingText());
 	}
 
+	public InputMode getInputMode(){
+		return mInputMode;
+	}
 
 	private void nextInputMode() {
 		if (mEditing == EDITING_STRICT_NUMERIC || mEditing == EDITING_DIALER) {
@@ -665,4 +676,10 @@ private void restoreAddedWordIfAny() {
 	protected View createSoftKeyView() {
 		return softKeyHandler.getView();
 	}
+
+	@Override
+	public void setInputView(View view) {
+		super.setInputView(view);
+		mSuggestionView = new SuggestionsView(settings, view, this);
+	}
 }
diff --git a/src/io/github/sspanak/tt9/preferences/SettingsStore.java b/src/io/github/sspanak/tt9/preferences/SettingsStore.java
index 504092499..64fa82bdc 100644
--- a/src/io/github/sspanak/tt9/preferences/SettingsStore.java
+++ b/src/io/github/sspanak/tt9/preferences/SettingsStore.java
@@ -4,14 +4,13 @@
 import android.content.SharedPreferences;
 import android.view.KeyEvent;
 
-import androidx.preference.PreferenceManager;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import androidx.preference.PreferenceManager;
 import io.github.sspanak.tt9.Logger;
 import io.github.sspanak.tt9.ime.modes.InputMode;
 import io.github.sspanak.tt9.languages.LanguageCollection;
@@ -208,7 +207,9 @@ public int getKeyShowSettings() {
 
 	public boolean getShowSoftKeys() { return prefs.getBoolean("pref_show_soft_keys", true); }
 
+	public boolean getShowSoftNumpad() { return prefs.getBoolean("pref_show_soft_numpad", false); }
 
+	public boolean getDpadSoftkeysNavigation() { return prefs.getBoolean("pref_dpad_softkeys_navigation", false); }
 
 	/************* typing settings *************/
 
diff --git a/src/io/github/sspanak/tt9/ui/NumpadButton.java b/src/io/github/sspanak/tt9/ui/NumpadButton.java
new file mode 100644
index 000000000..4033537f0
--- /dev/null
+++ b/src/io/github/sspanak/tt9/ui/NumpadButton.java
@@ -0,0 +1,140 @@
+package io.github.sspanak.tt9.ui;
+
+import android.content.Context;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.RelativeSizeSpan;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+
+import java.util.ArrayList;
+
+import io.github.sspanak.tt9.ime.TraditionalT9;
+import io.github.sspanak.tt9.ime.modes.InputMode;
+import io.github.sspanak.tt9.languages.Language;
+
+public class NumpadButton extends androidx.appcompat.widget.AppCompatButton implements View.OnTouchListener {
+	int number;
+	TraditionalT9 ims;
+	int textCase;
+	Language language;
+
+	public NumpadButton(Context context) {
+		super(context);
+		setDefaults();
+	}
+
+	public NumpadButton(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		setDefaults();
+	}
+
+	public NumpadButton(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		setDefaults();
+
+	}
+
+	protected void setDefaults(){
+		number = Integer.parseInt(getText().toString());
+		//Kept as a reference if someone wants to debug dpad navigation on a touch-screen device
+		//setFocusableInTouchMode(true); // only for debugging (also in SoftKeyHandler.java)
+	}
+
+
+	/**
+	 * call this if anything might have changed which causes a change in shown letters on the buttons
+	 * (e.g. after language is changed, to update the button texts e.g. from Latin to Kyrillic chars)
+	 * No additional pre-checks whether it really changed are necessary.
+	 *
+	 * @return returns whether it was necessary to invalidate the texts or whether not (e.g. neither language nor TextCase changed)
+	 */
+	public boolean invalidateText(Language language) {
+		if (this.language == language && textCase == ims.getInputMode().getTextCase()){
+			//no change in visualization necessary
+			return false;
+		}
+
+		//update in case it changed
+		textCase = ims.getInputMode().getTextCase();
+		this.language = language;
+
+		ArrayList<String> chars = language.getKeyCharacters(number, false);
+		SpannableStringBuilder sb = new SpannableStringBuilder(String.valueOf(number));
+		sb.append('\n');
+		for (String c: chars) {
+			if (textCase == InputMode.CASE_UPPER) {
+				c = c.toUpperCase(language.getLocale());
+			}
+			sb.append(c);
+		}
+		sb.setSpan(new RelativeSizeSpan(0.5f), 1, sb.length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
+
+		setText(sb);
+		return true;
+	}
+
+
+
+
+	public void setIMS(TraditionalT9 ims) {
+		this.ims = ims;
+		super.setOnTouchListener(this);
+	}
+
+	@Override
+	public boolean onTouch(View view, MotionEvent motionEvent) {
+		if (motionEvent.getAction() == KeyEvent.ACTION_DOWN){
+			sendKeyEvent(KeyEvent.ACTION_DOWN);
+			return false; //has always to be false, otherweise it is not working
+		}
+		//action up is handled in on performClick() which is called from supoer by buttons
+		return false;
+	}
+
+	@Override
+	public boolean performClick() {
+		super.performClick();
+		sendKeyEvent(KeyEvent.ACTION_UP);
+		return true;
+	}
+
+	/**
+	 *
+	 * @param action either KeyEvent.ACTION_DOWN or KeyEvent.ACTION_UP
+	 */
+	protected void sendKeyEvent(int action){
+		int keycode = getKeycode();
+		//since physical key events can not reliable simulated, directly send it to the TT9 implementation
+		boolean consumedByTT9;
+		if (action == KeyEvent.ACTION_DOWN){
+			consumedByTT9 = ims.onKeyDown(keycode, new KeyEvent(KeyEvent.ACTION_DOWN, keycode));
+		}else if (action == KeyEvent.ACTION_UP){
+			consumedByTT9 = ims.onKeyUp(keycode, new KeyEvent(KeyEvent.ACTION_UP, keycode));
+		}else {
+			throw new RuntimeException("Unsupported action code");
+		}
+		if (!consumedByTT9){
+			//means ims is in number mode, send the number key event directly
+			ims.getCurrentInputConnection().sendKeyEvent(new KeyEvent(action, keycode));
+		}
+	}
+
+	protected int getKeycode(){
+		switch (number) {
+			case 0: return KeyEvent.KEYCODE_0;
+			case 1: return KeyEvent.KEYCODE_1;
+			case 2: return KeyEvent.KEYCODE_2;
+			case 3: return KeyEvent.KEYCODE_3;
+			case 4: return KeyEvent.KEYCODE_4;
+			case 5: return KeyEvent.KEYCODE_5;
+			case 6: return KeyEvent.KEYCODE_6;
+			case 7: return KeyEvent.KEYCODE_7;
+			case 8: return KeyEvent.KEYCODE_8;
+			case 9: return KeyEvent.KEYCODE_9;
+			default: throw new RuntimeException("NumpadButton - unsupported number key code");
+		}
+	}
+}
diff --git a/src/io/github/sspanak/tt9/ui/SuggestionsAdapter.java b/src/io/github/sspanak/tt9/ui/SuggestionsAdapter.java
index e97db26e2..8225bee38 100644
--- a/src/io/github/sspanak/tt9/ui/SuggestionsAdapter.java
+++ b/src/io/github/sspanak/tt9/ui/SuggestionsAdapter.java
@@ -7,11 +7,11 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import java.util.List;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.List;
-
 public class SuggestionsAdapter extends RecyclerView.Adapter<SuggestionsAdapter.ViewHolder> {
 	private final int layout;
 	private final int textViewResourceId;
@@ -21,13 +21,15 @@ public class SuggestionsAdapter extends RecyclerView.Adapter<SuggestionsAdapter.
 	private int colorDefault;
 	private int colorHighlight;
 	private int selectedIndex = 0;
+	private final SuggestionsView suggView;
 
 
-	public SuggestionsAdapter(Context context, int layout, int textViewResourceId, List<String> suggestions) {
+	public SuggestionsAdapter(Context context, int layout, int textViewResourceId, List<String> suggestions, SuggestionsView suggView) {
 		this.layout = layout;
 		this.textViewResourceId = textViewResourceId;
 		this.mInflater = LayoutInflater.from(context);
 		this.mSuggestions = suggestions;
+		this.suggView = suggView;
 	}
 
 
@@ -73,6 +75,12 @@ public class ViewHolder extends RecyclerView.ViewHolder {
 		ViewHolder(View itemView) {
 			super(itemView);
 			suggestionItem = itemView.findViewById(textViewResourceId);
+			suggestionItem.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					suggView.onSuggestionViewHolderClicked(getAdapterPosition());
+				}
+			});
 		}
 	}
 }
diff --git a/src/io/github/sspanak/tt9/ui/SuggestionsView.java b/src/io/github/sspanak/tt9/ui/SuggestionsView.java
index 4a45c1ea6..d3bf271bf 100644
--- a/src/io/github/sspanak/tt9/ui/SuggestionsView.java
+++ b/src/io/github/sspanak/tt9/ui/SuggestionsView.java
@@ -5,16 +5,16 @@
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import io.github.sspanak.tt9.R;
+import io.github.sspanak.tt9.ime.TraditionalT9;
 import io.github.sspanak.tt9.preferences.SettingsStore;
 
 public class SuggestionsView {
@@ -24,11 +24,12 @@ public class SuggestionsView {
 	private final RecyclerView mView;
 	private final SettingsStore settings;
 	private SuggestionsAdapter mSuggestionsAdapter;
+	private final TraditionalT9 tt9;
 
 
-	public SuggestionsView(SettingsStore settings, View mainView) {
+	public SuggestionsView(SettingsStore settings, View mainView, TraditionalT9 tt9) {
 		super();
-
+		this.tt9 = tt9;
 		this.settings = settings;
 
 		mView = mainView.findViewById(R.id.main_suggestions_list);
@@ -60,7 +61,8 @@ private void initDataAdapter(Context context) {
 			context,
 			R.layout.suggestion_list_view,
 			R.id.suggestion_list_item,
-			suggestions
+			suggestions,
+			this
 		);
 		mView.setAdapter(mSuggestionsAdapter);
 
@@ -124,6 +126,12 @@ public void setSuggestions(List<String> newSuggestions, int initialSel) {
 		mView.scrollToPosition(selectedIndex);
 	}
 
+	public void onSuggestionViewHolderClicked(int position){
+		selectedIndex = position;
+		//no need for updating the adapter and ui related work as it will be cleared as soon it is chosen
+		tt9.onOK();
+	}
+
 
 	public void scrollToSuggestion(int increment) {
 		if (suggestions.size() <= 1) {