diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java
index 52ec8d7d..900c9001 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 
+import io.github.sspanak.tt9.ime.modes.InputMode;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 
 abstract public class AbstractHandler extends InputMethodService {
@@ -29,7 +30,7 @@ abstract public class AbstractHandler extends InputMethodService {
 	abstract protected void createSuggestionBar(View mainView);
 	abstract protected void forceShowWindowIfHidden();
 	abstract protected void renderMainView();
-	abstract protected void setStatusIcon(int iconResource);
+	abstract protected void setStatusIcon(InputMode mode);
 	abstract protected void setStatusText(String status);
 	abstract protected boolean shouldBeVisible();
 	abstract protected boolean shouldBeOff();
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java
index 5f5e2662..e810ee21 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java
@@ -256,7 +256,6 @@ public abstract class HotkeyHandler extends TypingHandler {
 		suggestionOps.scheduleDelayedAccept(mInputMode.getAutoAcceptTimeout()); // restart the timer
 		nextInputMode();
 		renderMainView();
-		setStatusIcon(mInputMode.getIcon());
 
 		forceShowWindowIfHidden();
 		return true;
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
index 1a879a07..b3de2c9e 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -11,10 +11,10 @@ import android.view.inputmethod.InputMethodManager;
 
 import androidx.annotation.NonNull;
 
+import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.db.DictionaryLoader;
 import io.github.sspanak.tt9.db.WordStoreAsync;
 import io.github.sspanak.tt9.ime.modes.InputMode;
-import io.github.sspanak.tt9.ime.modes.ModePassthrough;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.ui.UI;
 import io.github.sspanak.tt9.ui.dialogs.PopupDialog;
@@ -78,7 +78,7 @@ public class TraditionalT9 extends HotkeyHandler {
 		if (mainView.createView()) {
 			initTray();
 		}
-		setStatusIcon(mInputMode.getIcon());
+		setStatusIcon(mInputMode);
 		setStatusText(mInputMode.toString());
 		setDarkTheme();
 		mainView.render();
@@ -110,7 +110,7 @@ public class TraditionalT9 extends HotkeyHandler {
 
 	@Override
 	protected void onFinishTyping() {
-		if (!(mInputMode instanceof ModePassthrough)) {
+		if (!mInputMode.isPassthrough()) {
 			DictionaryLoader.autoLoad(this, mLanguage);
 		}
 		super.onFinishTyping();
@@ -121,7 +121,7 @@ public class TraditionalT9 extends HotkeyHandler {
 	protected void onStop() {
 		onFinishTyping();
 		suggestionOps.clear();
-		setStatusIcon(mInputMode.getIcon());
+		setStatusIcon(mInputMode);
 		setStatusText(mInputMode.toString());
 
 		if (isInputViewShown()) {
@@ -182,9 +182,9 @@ public class TraditionalT9 extends HotkeyHandler {
 
 
 	@Override
-	protected void setStatusIcon(int iconResource) {
-		if (iconResource > 0 && settings.isStatusIconEnabled()) {
-			showStatusIcon(iconResource);
+	protected void setStatusIcon(InputMode mode) {
+		if (!mode.isPassthrough() && settings.isStatusIconEnabled()) {
+			showStatusIcon(R.drawable.ic_status);
 		} else {
 			hideStatusIcon();
 		}
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java
index 8ae6635f..ce1dec16 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java
@@ -85,7 +85,6 @@ abstract public class InputMode {
 
 	// Utility
 	abstract public int getId();
-	abstract public int getIcon();
 	public int getSequenceLength() { return digitSequence.length(); } // The number of key presses for the current word.
 	public int getAutoAcceptTimeout() {
 		return autoAcceptTimeout;
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java
index c965bbce..aa19b9ca 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 
-import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.ime.helpers.InputType;
 import io.github.sspanak.tt9.languages.Language;
 import io.github.sspanak.tt9.languages.NaturalLanguage;
@@ -14,7 +13,6 @@ import io.github.sspanak.tt9.util.Characters;
 
 public class Mode123 extends ModePassthrough {
 	@Override public int getId() { return MODE_123; }
-	@Override public int getIcon() { return R.drawable.ic_mode_123; }
 	@Override @NonNull public String toString() { return "123"; }
 
 	@Override public final boolean is123() { return true; }
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java
index 40b70007..b03968d8 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java
@@ -2,7 +2,6 @@ package io.github.sspanak.tt9.ime.modes;
 
 import androidx.annotation.NonNull;
 
-import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.languages.Language;
 import io.github.sspanak.tt9.languages.LanguageKind;
 import io.github.sspanak.tt9.languages.NaturalLanguage;
@@ -13,7 +12,6 @@ public class ModeABC extends InputMode {
 	private boolean shouldSelectNextLetter = false;
 
 	@Override public int getId() { return MODE_ABC; }
-	@Override public int getIcon() { return textCase == CASE_UPPER ? R.drawable.ic_mode_abc_uppercase : R.drawable.ic_mode_abc; }
 
 	ModeABC(SettingsStore settings, Language lang) {
 		this.settings = settings;
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java
index 6af351fe..b97ac74d 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java
@@ -10,7 +10,6 @@ public class ModePassthrough extends InputMode {
 	}
 
 	@Override public int getId() { return MODE_PASSTHROUGH; }
-	@Override public int getIcon() { return 0; }
 	@Override public int getSequenceLength() { return 0; }
 	@Override @NonNull public String toString() { return "--"; }
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
index 95e5b1f6..c9b2617f 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
-import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.db.WordStoreAsync;
 import io.github.sspanak.tt9.ime.helpers.InputType;
 import io.github.sspanak.tt9.ime.helpers.TextField;
@@ -22,12 +21,9 @@ import io.github.sspanak.tt9.util.Text;
 public class ModePredictive extends InputMode {
 	private final String LOG_TAG = getClass().getSimpleName();
 
-
-
 	private final SettingsStore settings;
 
 	public int getId() { return MODE_PREDICTIVE; }
-	public int getIcon() { return R.drawable.ic_mode_predictive; }
 
 	private String lastAcceptedWord = "";
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java
index f0f5cf02..086d28aa 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java
@@ -2,6 +2,7 @@ package io.github.sspanak.tt9.preferences.screens.appearance;
 
 import androidx.preference.SwitchPreferenceCompat;
 
+import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 
 public class ItemStatusIcon {
@@ -13,6 +14,7 @@ public class ItemStatusIcon {
 	public ItemStatusIcon(SwitchPreferenceCompat item, SettingsStore settings) {
 		this.item = item;
 		this.settings = settings;
+		addAppNameToSummary();
 	}
 
 	public void populate() {
@@ -20,4 +22,13 @@ public class ItemStatusIcon {
 			item.setChecked(settings.isStatusIconEnabled());
 		}
 	}
+
+	private void addAppNameToSummary() {
+		if (item == null) {
+			return;
+		}
+
+		String summary = item.getContext().getString(R.string.pref_status_icon_summary, item.getContext().getString(R.string.app_name));
+		item.setSummary(summary);
+	}
 }
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_123.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_123.xml
deleted file mode 100644
index 4189fd93..00000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_mode_123.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="184"
-    android:viewportHeight="167.625"
-    android:tint="#FFFFFF">
-  <group android:scaleX="1.104"
-      android:scaleY="1.00575"
-      android:translateX="-9.568"
-      android:translateY="3.3734531">
-    <group android:translateY="133.66406">
-      <path android:pathData="M17.859375,-11.953125L41.0625,-11.953125L41.0625,-92.046875L15.828125,-86.984375L15.828125,-99.921875L40.921875,-104.984375L55.125,-104.984375L55.125,-11.953125L78.328125,-11.953125L78.328125,-0L17.859375,-0L17.859375,-11.953125Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M119.640625,-11.953125L169.20312,-11.953125L169.20312,0L102.546875,0L102.546875,-11.953125Q110.640625,-20.328125,124.59375,-34.421875Q138.54688,-48.515625,142.14062,-52.59375Q148.95312,-60.265625,151.65625,-65.5625Q154.375,-70.875,154.375,-76.015625Q154.375,-84.375,148.5,-89.640625Q142.625,-94.921875,133.20312,-94.921875Q126.53125,-94.921875,119.109375,-92.59375Q111.6875,-90.28125,103.25,-85.578125L103.25,-99.921875Q111.828125,-103.359375,119.28125,-105.109375Q126.734375,-106.875,132.92188,-106.875Q149.23438,-106.875,158.9375,-98.71875Q168.64062,-90.5625,168.64062,-76.921875Q168.64062,-70.453125,166.21875,-64.65625Q163.79688,-58.859375,157.39062,-50.984375Q155.64062,-48.9375,146.21875,-39.203125Q136.79688,-29.46875,119.640625,-11.953125Z"
-          android:fillColor="#000000"/>
-    </group>
-  </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_abc.xml
deleted file mode 100644
index 11db7ad9..00000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="179"
-    android:viewportHeight="167.625"
-    android:tint="#FFFFFF">
-  <group android:scaleX="1.0036364"
-      android:scaleY="0.9398578"
-      android:translateX="-0.32545453"
-      android:translateY="8.545555">
-    <group android:translateY="133.66406">
-      <path android:pathData="M49.359375,-39.59375Q33.6875,-39.59375,27.640625,-36Q21.59375,-32.421875,21.59375,-23.765625Q21.59375,-16.875,26.125,-12.828125Q30.65625,-8.796875,38.46875,-8.796875Q49.21875,-8.796875,55.71875,-16.421875Q62.234375,-24.046875,62.234375,-36.703125L62.234375,-39.59375L49.359375,-39.59375ZM75.171875,-44.9375L75.171875,-0L62.234375,-0L62.234375,-11.953125Q57.796875,-4.78125,51.1875,-1.359375Q44.578125,2.046875,35.015625,2.046875Q22.921875,2.046875,15.78125,-4.734375Q8.65625,-11.53125,8.65625,-22.921875Q8.65625,-36.21875,17.546875,-42.96875Q26.4375,-49.71875,44.09375,-49.71875L62.234375,-49.71875L62.234375,-50.984375Q62.234375,-59.90625,56.359375,-64.796875Q50.484375,-69.6875,39.875,-69.6875Q33.125,-69.6875,26.71875,-68.0625Q20.328125,-66.453125,14.421875,-63.21875L14.421875,-75.171875Q21.515625,-77.90625,28.1875,-79.28125Q34.875,-80.65625,41.203125,-80.65625Q58.296875,-80.65625,66.734375,-71.796875Q75.171875,-62.9375,75.171875,-44.9375Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M158.10938,-39.3125Q158.10938,-53.578125,152.23438,-61.703125Q146.35938,-69.828125,136.09375,-69.828125Q125.828125,-69.828125,119.953125,-61.703125Q114.09375,-53.578125,114.09375,-39.3125Q114.09375,-25.03125,119.953125,-16.90625Q125.828125,-8.796875,136.09375,-8.796875Q146.35938,-8.796875,152.23438,-16.90625Q158.10938,-25.03125,158.10938,-39.3125ZM114.09375,-66.796875Q118.171875,-73.828125,124.390625,-77.234375Q130.60938,-80.65625,139.26562,-80.65625Q153.60938,-80.65625,162.5625,-69.265625Q171.53125,-57.875,171.53125,-39.3125Q171.53125,-20.75,162.5625,-9.34375Q153.60938,2.046875,139.26562,2.046875Q130.60938,2.046875,124.390625,-1.359375Q118.171875,-4.78125,114.09375,-11.8125L114.09375,0L101.078125,0L101.078125,-109.40625L114.09375,-109.40625L114.09375,-66.796875Z"
-          android:fillColor="#000000"/>
-    </group>
-  </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc_uppercase.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_abc_uppercase.xml
deleted file mode 100644
index 8e9aeb30..00000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc_uppercase.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="198"
-    android:viewportHeight="167.625"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.96"
-      android:scaleY="0.8127273"
-      android:translateX="7.92"
-      android:translateY="19.048296">
-    <group android:translateY="133.66406">
-      <path android:pathData="M49.21875,-90.984375L29.953125,-38.75L68.5625,-38.75L49.21875,-90.984375ZM41.203125,-104.984375L57.3125,-104.984375L97.3125,-0L82.546875,-0L72.984375,-26.9375L25.671875,-26.9375L16.109375,-0L1.125,-0L41.203125,-104.984375Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M127.34375,-50.140625L127.34375,-11.671875L150.125,-11.671875Q161.57812,-11.671875,167.09375,-16.421875Q172.625,-21.171875,172.625,-30.9375Q172.625,-40.78125,167.09375,-45.453125Q161.57812,-50.140625,150.125,-50.140625L127.34375,-50.140625ZM127.34375,-93.3125L127.34375,-61.671875L148.35938,-61.671875Q158.76562,-61.671875,163.85938,-65.5625Q168.96875,-69.46875,168.96875,-77.484375Q168.96875,-85.4375,163.85938,-89.375Q158.76562,-93.3125,148.35938,-93.3125L127.34375,-93.3125ZM113.140625,-104.984375L149.42188,-104.984375Q165.65625,-104.984375,174.4375,-98.234375Q183.23438,-91.484375,183.23438,-79.03125Q183.23438,-69.40625,178.73438,-63.703125Q174.23438,-58.015625,165.51562,-56.609375Q176,-54.359375,181.79688,-47.21875Q187.59375,-40.078125,187.59375,-29.390625Q187.59375,-15.328125,178.03125,-7.65625Q168.46875,0,150.82812,0L113.140625,0L113.140625,-104.984375Z"
-          android:fillColor="#000000"/>
-    </group>
-  </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_predictive.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_predictive.xml
deleted file mode 100644
index a138321c..00000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_mode_predictive.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="180"
-    android:viewportHeight="167.625"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.96"
-      android:scaleY="0.894"
-      android:translateX="7.2"
-      android:translateY="12.236625">
-    <group android:translateY="133.66406">
-      <path android:pathData="M-0.421875,-104.984375L88.390625,-104.984375L88.390625,-93.03125L51.125,-93.03125L51.125,-0L36.84375,-0L36.84375,-93.03125L-0.421875,-93.03125L-0.421875,-104.984375Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M103.828125,-2.1875L103.828125,-15.125Q109.171875,-12.59375,114.65625,-11.25Q120.140625,-9.921875,125.40625,-9.921875Q139.46875,-9.921875,146.89062,-19.375Q154.3125,-28.828125,155.35938,-48.09375Q151.28125,-42.046875,145.01562,-38.8125Q138.76562,-35.578125,131.17188,-35.578125Q115.421875,-35.578125,106.25,-45.109375Q97.078125,-54.640625,97.078125,-71.15625Q97.078125,-87.328125,106.640625,-97.09375Q116.203125,-106.875,132.09375,-106.875Q150.29688,-106.875,159.89062,-92.921875Q169.5,-78.96875,169.5,-52.390625Q169.5,-27.5625,157.71875,-12.75Q145.9375,2.046875,126.046875,2.046875Q120.703125,2.046875,115.21875,0.984375Q109.734375,-0.078125,103.828125,-2.1875ZM132.09375,-46.6875Q141.65625,-46.6875,147.23438,-53.21875Q152.82812,-59.765625,152.82812,-71.15625Q152.82812,-82.484375,147.23438,-89.046875Q141.65625,-95.625,132.09375,-95.625Q122.53125,-95.625,116.9375,-89.046875Q111.34375,-82.484375,111.34375,-71.15625Q111.34375,-59.765625,116.9375,-53.21875Q122.53125,-46.6875,132.09375,-46.6875Z"
-          android:fillColor="#000000"/>
-    </group>
-  </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_status.xml b/app/src/main/res/drawable-anydpi-v24/ic_status.xml
new file mode 100644
index 00000000..89145801
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_status.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="1.104"
+      android:scaleY="1.104"
+      android:translateX="-1.248"
+      android:translateY="-1.248">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_123.png b/app/src/main/res/drawable-hdpi/ic_mode_123.png
deleted file mode 100644
index 8616d01c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_123.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_abc.png b/app/src/main/res/drawable-hdpi/ic_mode_abc.png
deleted file mode 100644
index 10bae3f3..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_abc.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_abc_uppercase.png b/app/src/main/res/drawable-hdpi/ic_mode_abc_uppercase.png
deleted file mode 100644
index 99339530..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_abc_uppercase.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_predictive.png b/app/src/main/res/drawable-hdpi/ic_mode_predictive.png
deleted file mode 100644
index 7badf704..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_predictive.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_status.png b/app/src/main/res/drawable-hdpi/ic_status.png
new file mode 100644
index 00000000..e273b682
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_status.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_123.png b/app/src/main/res/drawable-mdpi/ic_mode_123.png
deleted file mode 100644
index 1dcd4ab3..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_123.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_abc.png b/app/src/main/res/drawable-mdpi/ic_mode_abc.png
deleted file mode 100644
index b6d77838..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_abc.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_abc_uppercase.png b/app/src/main/res/drawable-mdpi/ic_mode_abc_uppercase.png
deleted file mode 100644
index a7bd3fd1..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_abc_uppercase.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_predictive.png b/app/src/main/res/drawable-mdpi/ic_mode_predictive.png
deleted file mode 100644
index 2fc74557..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_predictive.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_status.png b/app/src/main/res/drawable-mdpi/ic_status.png
new file mode 100644
index 00000000..14bb408c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_status.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_123.png b/app/src/main/res/drawable-xhdpi/ic_mode_123.png
deleted file mode 100644
index 814c94b3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_123.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_abc.png b/app/src/main/res/drawable-xhdpi/ic_mode_abc.png
deleted file mode 100644
index dcdc0d5b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_abc.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_abc_uppercase.png b/app/src/main/res/drawable-xhdpi/ic_mode_abc_uppercase.png
deleted file mode 100644
index babe5576..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_abc_uppercase.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_predictive.png b/app/src/main/res/drawable-xhdpi/ic_mode_predictive.png
deleted file mode 100644
index 0db4e40d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_predictive.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_status.png b/app/src/main/res/drawable-xhdpi/ic_status.png
new file mode 100644
index 00000000..ad05b5b1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_status.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_123.png b/app/src/main/res/drawable-xxhdpi/ic_mode_123.png
deleted file mode 100644
index a11b9f45..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_123.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_abc.png b/app/src/main/res/drawable-xxhdpi/ic_mode_abc.png
deleted file mode 100644
index 1d7a84b6..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_abc.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_abc_uppercase.png b/app/src/main/res/drawable-xxhdpi/ic_mode_abc_uppercase.png
deleted file mode 100644
index cd89a389..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_abc_uppercase.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_predictive.png b/app/src/main/res/drawable-xxhdpi/ic_mode_predictive.png
deleted file mode 100644
index 804b89d5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_predictive.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_status.png b/app/src/main/res/drawable-xxhdpi/ic_status.png
new file mode 100644
index 00000000..af2db27d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_status.png differ
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 5e2ebee0..313d8b5f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -23,8 +23,8 @@
 	<string name="pref_auto_capitals_after_newline_summary">Започвай всеки ред с главна буква, дори и да е в средата на изречение.</string>
 	<string name="pref_choose_languages">Езици</string>
 	<string name="dictionary_truncate_title">Изтрий всички</string>
-	<string name="pref_status_icon">Икона за режима на писане</string>
-	<string name="pref_status_icon_summary">Покажи текущия режим на писане с уведомителна икона.</string>
+	<string name="pref_status_icon">Икона за активност</string>
+	<string name="pref_status_icon_summary">Показвай икона, когато %1$s е активен.</string>
 	<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>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e84e340e..f8353ba0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -33,8 +33,8 @@
 	<string name="pref_auto_capitals_after_newline_summary">Jede Zeile mit einem Großbuchstaben beginnen, auch wenn es mitten im Satz ist.</string>
 	<string name="pref_choose_languages">Sprachen</string>
 
-	<string name="pref_status_icon">Icon für den Schreibmodus</string>
-	<string name="pref_status_icon_summary">Den aktuellen Schreibmodus mit einem Icon anzeigen.</string>
+	<string name="pref_status_icon">Aktivitäticon</string>
+	<string name="pref_status_icon_summary">Ein Icon anzeigen, wenn %1$s aktiv ist.</string>
 	<string name="dictionary_cancel_load">Laden abbrechen</string>
 	<string name="dictionary_load_cancelled">Laden abgebrochen.</string>
 	<string name="dictionary_loaded">Wörterbuch laden abgeschlossen.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2b9ab5d7..6a60a412 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -46,8 +46,8 @@
 	<string name="dictionary_truncate_title">Borrar todos</string>
 	<string name="dictionary_truncate_unselected">Borrar no seleccionados</string>
 	<string name="dictionary_truncated">Diccionario eliminado con éxito.</string>
-	<string name="pref_status_icon">Icono del modo de escritura</string>
-	<string name="pref_status_icon_summary">Indicar el modo de escritura actual con un icono.</string>
+	<string name="pref_status_icon">Icono de actividad</string>
+	<string name="pref_status_icon_summary">Mostrar un icono cuando %1$s está activo.</string>
 	<string name="dictionary_cancel_load">Cancelar la carga</string>
 	<string name="pref_auto_text_case">Mayúsculas automáticas</string>
 	<string name="pref_auto_text_case_summary">Escribir la primera letra de cada frase en mayúscula.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cf3c65a2..134c34d6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -23,8 +23,8 @@
 	<string name="pref_auto_capitals_after_newline_summary">Commencer chaque ligne avec une majuscule, même si elle est au milieu d\'une phrase.</string>
 	<string name="pref_choose_languages">Langues</string>
 	<string name="dictionary_truncate_title">Supprimer tous</string>
-	<string name="pref_status_icon">Icône du mode de saisie</string>
-	<string name="pref_status_icon_summary">Indiquer le mode de saisie actuel avec une icône.</string>
+	<string name="pref_status_icon">Icône d\'activité</string>
+	<string name="pref_status_icon_summary">Afficher une icône lorsque %1$s est actif.</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_loaded">Chargement du dictionnaire terminé.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 411cf69a..df0a5750 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -34,8 +34,8 @@
 	<string name="pref_auto_capitals_after_newline_summary">Iniziare ogni riga con una lettera maiuscola, anche se è nel mezzo di una frase.</string>
 	<string name="pref_choose_languages">Lingue</string>
 
-	<string name="pref_status_icon">Icona modalità di digitazione</string>
-	<string name="pref_status_icon_summary">Indicare la modalità di digitazione attuale con un\'icona.</string>
+	<string name="pref_status_icon">Icona di attività</string>
+	<string name="pref_status_icon_summary">Mostrare un\'icona quando %1$s è attivo.</string>
 	<string name="dictionary_cancel_load">Annullare il caricamento</string>
 	<string name="dictionary_loaded">Caricamento del dizionario terminato.</string>
 	<string name="dictionary_loading">Caricamento del dizionario (%1$s)…</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1656614e..51819050 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -46,8 +46,8 @@
 	<string name="pref_layout_tray">רשימת מילים בלבד</string>
 	<string name="pref_help">עזרה</string>
 
-	<string name="pref_status_icon">סמל מצב הקלדה</string>
-	<string name="pref_status_icon_summary">לציין את מצב הקלדה הנוכחי באמצעות סמל.</string>
+	<string name="pref_status_icon">סמל הפעילות</string>
+	<string name="pref_status_icon_summary">להציג סמל כאשר %1$s פעיל.</string>
 	<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>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index daac60fc..fe9bb1ed 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -55,8 +55,8 @@
 	<string name="pref_upside_down_keys">Atvirkštinė klavišų tvarka</string>
 	<string name="pref_upside_down_keys_summary">Įjunkite šį nustatymą jei pirmoje eilutėje turite 7–8–9, o ne 1–2–3.</string>
 
-	<string name="pref_status_icon">Rašymo režimo piktograma</string>
-	<string name="pref_status_icon_summary">Nurodyti dabartinį rašymo režimą piktograma.</string>
+	<string name="pref_status_icon">Aktyvumo piktograma</string>
+	<string name="pref_status_icon_summary">Rodyti piktogramą, kai %1$s yra aktyvus.</string>
 	<string name="dictionary_cancel_load">Atšaukti įkėlimą</string>
 	<string name="dictionary_load_bad_char">Įkelti \"%3$s\" kalbos nepavyko. Klaida %2$d eilutėje, netinkamas žodis - \"%1$s\".</string>
 	<string name="dictionary_load_error">Klaida įkeliant \"%1$s\" (%2$s) kalbos žodyną.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f182fe3b..159c156e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -31,8 +31,8 @@
 	<string name="pref_auto_capitals_after_newline">Automatische hoofdletters op elke regel</string>
 	<string name="pref_auto_capitals_after_newline_summary">Elke regel beginnen met een hoofdletter, zelfs als het midden van een zin is.</string>
 	<string name="pref_choose_languages">Talen</string>
-	<string name="pref_status_icon">Typemodus-icoon</string>
-	<string name="pref_status_icon_summary">Geef de huidige typmodus aan met een icoon.</string>
+	<string name="pref_status_icon">Activiteitsicoon</string>
+	<string name="pref_status_icon_summary">" Een icoon tonen wanneer %1$s actief is."</string>
 	<string name="dictionary_cancel_load">Laden annuleren</string>
 	<string name="dictionary_load_cancelled">Laden geannuleerd.</string>
 	<string name="dictionary_loaded">Woordenboek laden voltooid.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2497bea5..289ebb53 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -47,8 +47,8 @@
 	<string name="pref_layout_tray">Apenas lista de palavras</string>
 	<string name="pref_help">Ajuda</string>
 
-	<string name="pref_status_icon">Ícone do modo de digitação</string>
-	<string name="pref_status_icon_summary">Indique o modo de digitação atual com um ícone.</string>
+	<string name="pref_status_icon">Ícone de ativação</string>
+	<string name="pref_status_icon_summary">Mostrar um ícone quando %1$s está ativo.</string>
 	<string name="dictionary_cancel_load">Cancelar Carregamento</string>
 	<string name="dictionary_load_bad_char">Falha no carregamento. \"%1$s\" na linha %2$d do idioma \"%3$s\".</string>
 	<string name="dictionary_load_error">Falha no carregamento do dicionário para o idioma \"%1$s\" (%2$s).</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9845c921..05be7227 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -23,8 +23,8 @@
 	<string name="pref_auto_capitals_after_newline_summary">Начинать каждую строку с заглавной буквы, даже если она в середине предложения.</string>
 	<string name="pref_choose_languages">Языки</string>
 	<string name="dictionary_truncate_title">Удалить все</string>
-	<string name="pref_status_icon">Иконка режима ввода</string>
-	<string name="pref_status_icon_summary">Отображать текущий режим ввода с помощью иконки.</string>
+	<string name="pref_status_icon">Иконка активности</string>
+	<string name="pref_status_icon_summary">Показать иконку, когда %1$s активен.</string>
 	<string name="dictionary_cancel_load">Отменить загрузку</string>
 	<string name="dictionary_load_error">Ошибка загрузки словаря для языка «%1$s» (%2$s).</string>
 	<string name="dictionary_loaded">Загрузка словаря завершена.</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 926427fd..f5c40f6f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -60,8 +60,8 @@
 	<string name="pref_upside_down_keys">Зворотній порядок клавіш</string>
 	<string name="pref_upside_down_keys_summary">Використовуйте це налаштування, якщо у вас в першому ряді 7–8–9 замість 1–2–3.</string>
 
-	<string name="pref_status_icon">Іконка режиму введення</string>
-	<string name="pref_status_icon_summary">Показати поточний режим введення за допомогою іконка.</string>
+	<string name="pref_status_icon">Іконка активності</string>
+	<string name="pref_status_icon_summary">Показати іконку, коли %1$s активний.</string>
 	<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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b9729d1..65a863e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,8 +66,8 @@
 	<string name="pref_layout_tray">Suggestion list only</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>
-	<string name="pref_status_icon">Typing Mode Icon</string>
-	<string name="pref_status_icon_summary">Show a status icon indicating the current typing mode.</string>
+	<string name="pref_status_icon">Activeness Icon</string>
+	<string name="pref_status_icon_summary">Show an icon when %1$s is active.</string>
 
 	<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>