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 9cee8fe1..1a879a07 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
@@ -121,8 +121,8 @@ public class TraditionalT9 extends HotkeyHandler {
 	protected void onStop() {
 		onFinishTyping();
 		suggestionOps.clear();
-		setStatusIcon(0);
-		setStatusText("--");
+		setStatusIcon(mInputMode.getIcon());
+		setStatusText(mInputMode.toString());
 
 		if (isInputViewShown()) {
 			updateInputViewShown();
@@ -144,6 +144,9 @@ public class TraditionalT9 extends HotkeyHandler {
 		mainView.forceCreateView();
 		initTray();
 		setDarkTheme();
+		setStatusText(mInputMode.toString());
+		suggestionOps.set(mInputMode.getSuggestions());
+
 		return mainView.getView();
 	}
 
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 39f79b29..593cb4fa 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
@@ -12,9 +12,9 @@ public class ModePassthrough extends InputMode {
 	}
 
 	@Override public int getId() { return MODE_PASSTHROUGH; }
-	@Override public int getIcon() { return R.drawable.ic_mode_passthrough; }
+	@Override public int getIcon() { return 0; }
 	@Override public int getSequenceLength() { return 0; }
-	@Override @NonNull public String toString() { return "Passthrough"; }
+	@Override @NonNull public String toString() { return "--"; }
 
 	@Override public boolean isNumeric() { return true; }
 	@Override public boolean isPassthrough() { return true; }
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_passthrough.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_passthrough.xml
deleted file mode 100644
index 71cb7b9f..00000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_mode_passthrough.xml
+++ /dev/null
@@ -1,20 +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="256"
-    android:viewportHeight="167.625"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.96"
-      android:scaleY="0.62859374"
-      android:translateY="27.775986">
-    <group android:translateY="133.66406">
-      <path android:pathData="M14.140625,-104.984375L33.265625,-104.984375L79.8125,-17.15625L79.8125,-104.984375L93.59375,-104.984375L93.59375,-0L74.46875,-0L27.921875,-87.828125L27.921875,-0L14.140625,-0L14.140625,-104.984375Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M144.5625,-104.984375L156.51562,-104.984375L119.953125,13.359375L108,13.359375L144.5625,-104.984375Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M206.21875,-90.984375L186.95312,-38.75L225.5625,-38.75L206.21875,-90.984375ZM198.20312,-104.984375L214.3125,-104.984375L254.3125,0L239.54688,0L229.98438,-26.9375L182.67188,-26.9375L173.10938,0L158.125,0L198.20312,-104.984375Z"
-          android:fillColor="#000000"/>
-    </group>
-  </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_passthrough.png b/app/src/main/res/drawable-hdpi/ic_mode_passthrough.png
deleted file mode 100644
index ce8e6178..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_passthrough.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_passthrough.png b/app/src/main/res/drawable-mdpi/ic_mode_passthrough.png
deleted file mode 100644
index 1590646c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_passthrough.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_passthrough.png b/app/src/main/res/drawable-xhdpi/ic_mode_passthrough.png
deleted file mode 100644
index 712d17e5..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_passthrough.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_passthrough.png b/app/src/main/res/drawable-xxhdpi/ic_mode_passthrough.png
deleted file mode 100644
index 1ba39539..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_passthrough.png and /dev/null differ