diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TextEditingHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/TextEditingHandler.java
index 2d435221..f2c44a15 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/TextEditingHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/TextEditingHandler.java
@@ -1,8 +1,5 @@
 package io.github.sspanak.tt9.ime;
 
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-
 import io.github.sspanak.tt9.ime.modes.InputModeKind;
 import io.github.sspanak.tt9.languages.LanguageCollection;
 import io.github.sspanak.tt9.languages.LanguageKind;
@@ -14,10 +11,10 @@ abstract public class TextEditingHandler extends VoiceHandler {
 
 
 	@Override
-	protected boolean onStart(InputConnection connection, EditorInfo field) {
+	protected void initTray() {
+		super.initTray();
 		detectRTL();
 		suggestionOps.setRTL(isLanguageRTL);
-		return super.onStart(connection, field);
 	}
 
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a9941b2e..12eae4c0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -57,6 +57,7 @@
 
 	<!-- status bar -->
 	<style name="TTheme.MainSmall.StatusBar.Wrapper" parent="">
+		<item name="android:layoutDirection">locale</item>
 		<item name="android:layout_height">@dimen/status_bar_height</item>
 		<item name="android:layout_width">match_parent</item>
 	</style>
@@ -157,11 +158,7 @@
 	*******************************************-->
 
 	<!-- The keyboard itself -->
-	<style name="TTheme.Numpad" parent="TTheme.Keyboard">
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_width">0dp</item>
-		<item name="android:layout_weight">100</item>
-		<item name="android:orientation">vertical</item>
+	<style name="TTheme.Numpad" parent="TTheme.MainSmall">
 		<item name="android:paddingBottom">@dimen/numpad_keys_spacing_bottom</item>
 	</style>
 
@@ -181,9 +178,10 @@
 
 	<!-- status + suggestions container -->
 	<style name="TTheme.Numpad.StatusBar.Wrapper" parent="">
+		<item name="android:layoutDirection">locale</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_width">0dp</item>
-		<item name="android:layout_weight">1</item>"
+		<item name="android:layout_weight">1</item>
 	</style>
 
 	<!-- one suggestion -->