diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
index 895ecd1..07f1365 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
@@ -228,6 +228,16 @@
         mInoutContainer.setVisibility((state.activityIn || state.activityOut)
                 ? View.VISIBLE : View.GONE);
 
+        if (R.drawable.ic_4g_plus_mobiledata == state.typeId) {
+            if (!state.activityIn && !state.activityOut) {
+                mMobileType.setImageResource(R.drawable.ic_4g_mobiledata);
+                mMobileType.setVisibility(View.VISIBLE);
+            } else {
+                mMobileType.setImageResource(state.typeId);
+                mMobileType.setVisibility(View.VISIBLE);
+            }
+        }
+
         if (mState.volteId != state.volteId) {
             if (state.volteId != 0) {
                 mVolte.setImageResource(state.volteId);
