diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png
index daf18c77fd221..d9ec745ee5d31 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png
new file mode 100644
index 0000000000000..117cf1902373f
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png
index 5292998ea3074..2cebe856e1a92 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png
new file mode 100644
index 0000000000000..7c60bea8cbdcb
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png
new file mode 100644
index 0000000000000..9e6323c350f5d
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png
new file mode 100644
index 0000000000000..09b35b3735769
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png
new file mode 100644
index 0000000000000..2220c7307d4d3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png
new file mode 100644
index 0000000000000..ea987f1e79ee6
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png
new file mode 100644
index 0000000000000..21db6a2f1de52
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png
new file mode 100644
index 0000000000000..5e8baa489096d
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png
index 3e7fefda293c2..90b8c84e87794 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png
new file mode 100644
index 0000000000000..588140270d8e2
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png differ
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index a05fcc15609f1..c65f581f200cd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -282,7 +282,8 @@ public class NetworkController extends BroadcastReceiver {
 
     public void refreshSignalCluster(SignalCluster cluster) {
         cluster.setWifiIndicators(
-                mWifiConnected, // only show wifi in the cluster if connected
+                // only show wifi in the cluster if connected or if wifi-only
+                mWifiEnabled && (mWifiConnected || !mHasMobileDataFeature),
                 mWifiIconId,
                 mWifiActivityIconId,
                 mContentDescriptionWifi);
@@ -786,7 +787,7 @@ public class NetworkController extends BroadcastReceiver {
             if (mDataAndWifiStacked) {
                 mWifiIconId = 0;
             } else {
-                mWifiIconId = mWifiEnabled ? WifiIcons.WIFI_SIGNAL_STRENGTH[0][0] : 0;
+                mWifiIconId = mWifiEnabled ? R.drawable.stat_sys_wifi_signal_null : 0;
             }
             mContentDescriptionWifi = mContext.getString(R.string.accessibility_no_wifi);
         }