diff --git a/res/layout/addwordview.xml b/res/layout/addwordview.xml
index 355ae626..c148c5fb 100644
--- a/res/layout/addwordview.xml
+++ b/res/layout/addwordview.xml
@@ -10,6 +10,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginVertical="4dp"
+		android:hint="@string/add_word_field_placeholder"
 		android:inputType="text"
 		android:imeOptions="actionSend"
 		android:privateImeOptions="io.github.sspanak.tt9.addword=true"
diff --git a/res/layout/mainview.xml b/res/layout/mainview.xml
index ced08e29..4ad10f7f 100644
--- a/res/layout/mainview.xml
+++ b/res/layout/mainview.xml
@@ -1,5 +1,6 @@
 <?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:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
@@ -30,7 +31,8 @@
 			android:focusable="false"
 			android:longClickable="true"
 			android:text="⚙"
-			android:textSize="24sp"/>
+			android:textSize="@dimen/soft_key_icon_size"
+			tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />
 
 		<View
 			android:id="@+id/main_separator_left"
@@ -46,7 +48,8 @@
 			android:clickable="true"
 			android:focusable="false"
 			android:longClickable="true"
-			android:text="@android:string/ok" />
+			android:text="@android:string/ok"
+			tools:ignore="ButtonOrder,KeyboardInaccessibleWidget" />
 
 		<View
 			android:id="@+id/main_separator_right"
@@ -63,7 +66,8 @@
 			android:focusable="false"
 			android:longClickable="true"
 			android:text="⌫"
-			android:textSize="24sp" />
+			android:textSize="@dimen/soft_key_icon_size"
+			tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />
 
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/preferences_container.xml b/res/layout/preferences_container.xml
index 4f42572e..9c0570e7 100644
--- a/res/layout/preferences_container.xml
+++ b/res/layout/preferences_container.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/preferences_container"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	tools:context=".preferences.screens.MainSettingsScreen">
-</FrameLayout>
+	tools:context=".preferences.screens.MainSettingsScreen"
+	android:orientation="vertical">
+</LinearLayout>
diff --git a/res/menu/add_word.xml b/res/menu/add_word.xml
deleted file mode 100644
index 079cba9c..00000000
--- a/res/menu/add_word.xml
+++ /dev/null
@@ -1 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 020b8af1..a102776f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_settings">Настройки на TT9</string>
-	<string name="close">Затвори</string>
 	<string name="completed">Завършено</string>
 	<string name="error_unexpected">Възникна неочаквана грешка.</string>
 
 	<string name="add_word_add">Добави</string>
 	<string name="add_word_blank">Не може да се въведе празна дума.</string>
-	<string name="add_word_badchar">Не може да се въведе дума с непозволени символи за %1$s (%2$s).</string>
 	<string name="add_word_exist">Думата „%1$s“ е вече речника.</string>
-	<string name="add_word_invalid_language">Не може да добавяте думи без да е избран език.</string>
 	<string name="add_word_title">Добавяне на дума</string>
 
 	<string name="pref_category_about">За приложението</string>
@@ -22,7 +19,6 @@
 	<string name="dictionary_cancel_load">Отмени зареждането</string>
 	<string name="dictionary_load_bad_char">Неуспешно зареждане. Невалидна дума „%1$s“ на ред %2$d за език „%3$s“.</string>
 	<string name="dictionary_load_error">Несупешно зареждане на речник за език „%1$s“ (%2$s).</string>
-	<string name="dictionary_load_failed">Неуспешно зареждане на речник.</string>
 	<string name="dictionary_loaded">Зареждането на речник приключи.</string>
 	<string name="dictionary_loading">Зареждане на речник (%1$s)…</string>
 	<string name="dictionary_load_title">Зареди речник</string>
@@ -53,4 +49,5 @@
 	<string name="pref_double_zero_char">Символ при многократно натисната \"0\"</string>
 	<string name="char_newline">Нов ред</string>
 	<string name="char_space">Интервал</string>
+	<string name="add_word_field_placeholder">Напишете дума...</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 03c19f34..8fed747a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_settings">TT9 Einstellungen</string>
-	<string name="close">Schließen</string>
 	<string name="error_unexpected">Unerwarteter Fehler aufgetreten.</string>
 
 	<string name="add_word_add">Hinzufügen</string>
 	<string name="add_word_blank">Leeres Wort nicht hinzugefügt.</string>
-	<string name="add_word_badchar">Wort mit nicht zuordbarem Buchstaben für %1$s (%2$s) kann nicht hinzugefügt werden.</string>
 	<string name="add_word_exist">Das Wort \"%1$s\" ist bereits in Wörterbuch.</string>
 	<string name="add_word_title">Wort hinzufügen</string>
 
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a761d176..71811193 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2,9 +2,7 @@
 <resources>
 	<string name="app_settings">Configuración de Traditional T9</string>
 	<string name="add_word_add">Agregar palabra</string>
-	<string name="close">Cerrar</string>
 	<string name="add_word_blank">Palabra en blanco no agregada.</string>
-	<string name="add_word_badchar">No puedo agregar una palabra cn un caracter no mapeabe %1$s (%2$s).</string>
 	<string name="pref_help">Ayuda</string>
 	<string name="completed">Acabado</string>
 	<string name="error_unexpected">Ocurrió un error inesperado.</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 92ba8c3f..c3620aed 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_settings">Paramètres de TT9</string>
-	<string name="close">Fermer</string>
 	<string name="completed">Fini</string>
 	<string name="error_unexpected">Une erreur inattendue s\'est produite.</string>
 
 	<string name="add_word_add">Ajouter</string>
 	<string name="add_word_blank">Mot vide non ajouté.</string>
-	<string name="add_word_badchar">Impossible d\'ajouter un mot avec des caractères inexistants pour %1$s (%2$s).</string>
 	<string name="add_word_exist">Le mot «%1$s» est déjà dans le dictionnaire.</string>
 	<string name="add_word_title">Ajouter un mot</string>
 
@@ -21,7 +19,6 @@
 	<string name="pref_category_dictionaries">Dictionnaires</string>
 	<string name="dictionary_cancel_load">Annuler le chargement</string>
 	<string name="dictionary_load_error">Echec du chargement de dictionnaire pour langue «%1$s» (%2$s).</string>
-	<string name="dictionary_load_failed">Echec du chargement de dictionnaire.</string>
 	<string name="dictionary_loaded">Chargement du dictionnaire terminé.</string>
 	<string name="dictionary_loading">Chargement du dictionnaire (%1$s)…</string>
 	<string name="dictionary_load_title">Charger le dictionnaire</string>
@@ -39,9 +36,9 @@
 	<string name="pref_auto_space_summary">Ajouter automatiquement un espace après signes de ponctuation et mots.</string>
 	<string name="pref_auto_text_case_summary">Commencer automatiquement les phrases avec une majuscule.</string>
 	<string name="dictionary_missing_go_load_it">Pas de dictionnaire pour langue «%1$s». Veuillez le charger à l\'écran Paramètres.</string>
-	<string name="add_word_invalid_language">Impossible d\'ajouter un mot, si aucune langue n\'est choisie.</string>
 	<string name="pref_category_keypad">Clavier</string>
 	<string name="char_space">Espace</string>
 	<string name="char_newline">Nouvelle ligne</string>
 	<string name="pref_double_zero_char">Caractère lorsque «0» est appuyé plusieurs fois</string>
+	<string name="add_word_field_placeholder">Tapez un mot...</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b966fbc2..e259f3be 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_settings">TT9 Impostazioni</string>
-	<string name="close">Chiudi</string>
 	<string name="completed">Completato</string>
 	<string name="error_unexpected">Si è verificato un errore imprevisto.</string>
 
 	<string name="add_word_add">Aggiungere</string>
 	<string name="add_word_blank">Nessuna parola da aggiungere.</string>
-	<string name="add_word_badchar">Impossibile aggiungere parola con caratteri inesistenti per %1$s (%2$s).</string>
 	<string name="add_word_exist">Parola “%1$s” già nel dizionario.</string>
 	<string name="add_word_title">Aggiungi parola</string>
 
@@ -19,7 +17,6 @@
 
 	<string name="pref_category_dictionaries">Dizionari</string>
 	<string name="dictionary_cancel_load">Annullare il caricamento</string>
-	<string name="dictionary_load_failed">Caricamento del dizionario non riuscito.</string>
 	<string name="dictionary_loaded">Caricamento del dizionario terminato.</string>
 	<string name="dictionary_loading">Caricamento del dizionario (%1$s)…</string>
 	<string name="dictionary_load_title">Carica il dizionario</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7479416e..38e0d548 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_settings">TT9 Opties</string>
-	<string name="close">Sluiten</string>
 	<string name="error_unexpected">Er is een onverwachte fout opgetreden.</string>
 
 	<string name="add_word_add">Toevoegen</string>
 	<string name="add_word_blank">Leeg woord niet toegevoegd.</string>
-	<string name="add_word_badchar">Kan geen woord met niet-toewijsbaar teken toevoegen voor %1$s (%2$s).</string>
 	<string name="add_word_exist">Woord \"%1$s\" staat al in het woordenboek.</string>
-	<string name="add_word_invalid_language">Kan geen woord invoegen als er geen taal is geselecteerd.</string>
 	<string name="add_word_title">Woord toevoegen</string>
 	<string name="pref_category_about">Over de applicatie</string>
 	<string name="pref_help">Helpen</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 252a7eb3..fbb246cb 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_settings">TT9 настройки</string>
-	<string name="close">Закрыть</string>
 	<string name="completed">Выполнено</string>
 	<string name="error_unexpected">Произошла непредвиденная ошибка.</string>
 
 	<string name="add_word_add">Добавить</string>
-	<string name="add_word_badchar">Невозможно добавить слово с таким символом %1$s (%2$s).</string>
 	<string name="add_word_blank">Невозможно добавить слово.</string>
 	<string name="add_word_exist">Слово «%1$s» уже есть в словаре.</string>
-	<string name="add_word_invalid_language">Чтобы добавить новое слово, сначала выберите язык.</string>
 	<string name="add_word_title">Добавить слово</string>
 
 	<string name="pref_category_about">О приложении</string>
@@ -21,7 +18,6 @@
 	<string name="pref_category_dictionaries">Словари</string>
 	<string name="dictionary_cancel_load">Отменить загрузку</string>
 	<string name="dictionary_load_error">Ошибка загрузки словаря для языка «%1$s» (%2$s).</string>
-	<string name="dictionary_load_failed">Ошибка загрузки словаря.</string>
 	<string name="dictionary_loaded">Загрузка словаря завершена.</string>
 	<string name="dictionary_loading">Загрузка словаря (%1$s)…</string>
 	<string name="dictionary_load_title">Загрузить словарь</string>
@@ -53,4 +49,5 @@
 	<string name="key_hold_key">(зажать)</string>
 	<string name="key_back">Назад</string>
 	<string name="key_call">Позвонить</string>
+	<string name="add_word_field_placeholder">Введите слово...</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f94223dc..e24847d5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_settings">Налаштування TT9</string>
-	<string name="close">Закрити</string>
 	<string name="completed">Зроблено</string>
 	<string name="error_unexpected">Сталася неочікувана помилка.</string>
 
 	<string name="add_word_add">Додати</string>
-	<string name="add_word_badchar">Неможливо додати слово з таким символом %1$s (%2$s).</string>
 	<string name="add_word_blank">Неможливо додати слово.</string>
 	<string name="add_word_exist">Слово «%1$s» вже є в словнику.</string>
 	<string name="add_word_title">Додати слово</string>
@@ -20,7 +18,6 @@
 	<string name="pref_category_dictionaries">Словники</string>
 	<string name="dictionary_cancel_load">Скасувати завантаження</string>
 	<string name="dictionary_load_error">Помилка завантаження словника для мови «%1$s» (%2$s).</string>
-	<string name="dictionary_load_failed">Помилка завантаження словника.</string>
 	<string name="dictionary_loaded">Завантаження словника завершено.</string>
 	<string name="dictionary_loading">Завантаження словника (%1$s)…</string>
 	<string name="dictionary_load_title">Завантажити словник</string>
@@ -52,4 +49,5 @@
 	<string name="dictionary_truncated">Словник успішно очищено.</string>
 	<string name="dictionary_missing_go_load_it">Немає словника для мови «%1$s». Перейдіть до Налаштувань, щоб завантажити його.</string>
 	<string name="dictionary_load_bad_char">Помилка завантаження. Недійсне слово «%1$s» в рядку %2$d мови «%3$s».</string>
+	<string name="add_word_field_placeholder">Введіть слово...</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16c6e29c..e77bbcb6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,16 +3,15 @@
 	<string translatable="false" name="help_url">https://github.com/sspanak/tt9/blob/master/docs/user-manual.md</string>
 	<string name="app_name" translatable="false">Traditional T9</string>
 	<string name="app_settings">TT9 Settings</string>
-	<string name="close">Close</string>
 	<string name="completed">Completed</string>
 	<string name="error_unexpected">Unexpected error occurred.</string>
 
 	<string name="add_word_add">Add</string>
 	<string name="add_word_blank">Blank word not added.</string>
-	<string name="add_word_badchar">Cannot add word with unmappable character for %1$s (%2$s).</string>
 	<string name="add_word_exist">Word \"%1$s\" already in the dictionary.</string>
-	<string name="add_word_invalid_language">Cannot add a word when no language is selected.</string>
+	<string name="add_word_invalid_language" translatable="false">Cannot add a word when no language is selected.</string>
 	<string name="add_word_title">Add Word</string>
+	<string name="add_word_field_placeholder">Type a word...</string>
 
 	<string name="pref_category_about">About</string>
 	<string name="pref_category_appearance">Appearance</string>
@@ -34,7 +33,6 @@
 	<string name="dictionary_cancel_load">Cancel loading</string>
 	<string name="dictionary_load_bad_char">Loading failed. Invalid word \"%1$s\" on line %2$d of language \"%3$s\".</string>
 	<string name="dictionary_load_error">Failed loading the dictionary for language \"%1$s\" (%2$s).</string>
-	<string name="dictionary_load_failed">Dictionary load failed.</string>
 	<string name="dictionary_load_cancelled">Dictionary load cancelled.</string>
 	<string name="dictionary_loaded">Dictionary load completed.</string>
 	<string name="dictionary_loading">Loading dictionary (%1$s)…</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8ceac149..bef88603 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -2,7 +2,7 @@
 <resources>
 	<style name="hSeparator">
 		<item name="android:layout_height">match_parent</item>
-		<item name="android:layout_width">2px</item>
+		<item name="android:layout_width">3dp</item>
 		<item name="android:layout_marginBottom">1dp</item>
 		<item name="android:layout_marginTop">1dp</item>
 	</style>
diff --git a/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java b/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java
index 0e110132..1705739d 100644
--- a/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java
+++ b/src/io/github/sspanak/tt9/ime/SoftKeyHandler.java
@@ -1,7 +1,6 @@
 package io.github.sspanak.tt9.ime;
 
 import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
@@ -28,7 +27,7 @@ class SoftKeyHandler implements View.OnTouchListener {
 
 	View getView() {
 		if (view == null) {
-			view = LayoutInflater.from(tt9.getApplicationContext()).inflate(R.layout.mainview, null);
+			view = View.inflate(tt9.getApplicationContext(), R.layout.mainview, null);
 
 			for (int buttonId : buttons) {
 				view.findViewById(buttonId).setOnTouchListener(this);
diff --git a/src/io/github/sspanak/tt9/ui/AddWordAct.java b/src/io/github/sspanak/tt9/ui/AddWordAct.java
index bce1b096..7e32925b 100644
--- a/src/io/github/sspanak/tt9/ui/AddWordAct.java
+++ b/src/io/github/sspanak/tt9/ui/AddWordAct.java
@@ -40,7 +40,7 @@ public class AddWordAct extends AppCompatActivity {
 		word = i.getStringExtra("io.github.sspanak.tt9.word");
 		lang = i.getIntExtra("io.github.sspanak.tt9.lang", -1);
 
-		View v = getLayoutInflater().inflate(R.layout.addwordview, null);
+		View v = View.inflate(this, R.layout.addwordview, null);
 
 		EditText et = v.findViewById(R.id.add_word_text);
 		et.setOnClickListener(this::addWord);