diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_in.png
deleted file mode 100644
index 6e845462f3963..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_out.png
deleted file mode 100644
index 11ffbde017f59..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_in.png
deleted file mode 100644
index 2bb923e6dbd4e..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_inout.png
deleted file mode 100644
index 783ad17551000..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_out.png
deleted file mode 100644
index e499f9d42847f..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_in.png
deleted file mode 100644
index 31c0936623619..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_inout.png
deleted file mode 100644
index 7e9b752f7b9b3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_out.png
deleted file mode 100644
index 3209234d94a08..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_in.png
deleted file mode 100644
index 95c56ede38a55..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_inout.png
deleted file mode 100644
index 11b9a93aaa0a7..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_out.png
deleted file mode 100644
index 0f85ca0d73806..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_in.png
deleted file mode 100644
index 9aeb07a89625d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_inout.png
deleted file mode 100644
index 772b10c1fe1e6..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_out.png
deleted file mode 100644
index 9178c69c60502..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_in.png
deleted file mode 100644
index 16cb290e71ab0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_inout.png
deleted file mode 100644
index 6484e67cfc466..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_out.png
deleted file mode 100644
index 8a4abc4835600..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_in.png
deleted file mode 100644
index 05c50ccdf67cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_inout.png
deleted file mode 100644
index 60aa016f72491..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_out.png
deleted file mode 100644
index dec27630d32d2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_in.png
deleted file mode 100644
index 90e64d77dfcf7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_inout.png
deleted file mode 100644
index 866d616875d6e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_out.png
deleted file mode 100644
index a4089b50e80ee..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_in.xml b/packages/SystemUI/res/drawable/stat_sys_signal_in.xml
new file mode 100644
index 0000000000000..a083d807190a0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_in.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M9.000000,15.700000l-3.000000,5.599999 -3.000000,-5.599999z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_inout.xml b/packages/SystemUI/res/drawable/stat_sys_signal_inout.xml
new file mode 100644
index 0000000000000..1919860020050
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_inout.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M9.000000,15.700000l-3.000000,5.599999 -3.000000,-5.599999z"/>
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M3.000000,13.700000l3.000000,-5.700000 3.000000,5.700000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_none.xml b/packages/SystemUI/res/drawable/stat_sys_signal_none.xml
new file mode 100644
index 0000000000000..f4b72cdebdce2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_none.xml
@@ -0,0 +1,22 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <!-- no path, drawable is intended to be transparent -->
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_out.xml b/packages/SystemUI/res/drawable/stat_sys_signal_out.xml
new file mode 100644
index 0000000000000..c0e0df5decf9a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_out.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M3.000000,13.700000l3.000000,-5.700000 3.000000,5.700000z"/>
+</vector>
diff --git a/packages/SystemUI/res/layout/msim_signal_cluster_view.xml b/packages/SystemUI/res/layout/msim_signal_cluster_view.xml
index 3d6f0b56e47c6..1f9e66ded0fdc 100644
--- a/packages/SystemUI/res/layout/msim_signal_cluster_view.xml
+++ b/packages/SystemUI/res/layout/msim_signal_cluster_view.xml
@@ -76,17 +76,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/data_combo"
-        android:visibility="gone"
+        android:visibility="visible"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout
@@ -181,15 +177,11 @@
         android:id="@+id/data_combo_sub2"
         android:visibility="gone"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout_sub2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout
@@ -260,15 +252,11 @@
         android:id="@+id/data_combo_sub3"
         android:visibility="gone"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout_sub3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout
diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml
index 6d2df41ba0a17..eeb4596d7281b 100644
--- a/packages/SystemUI/res/layout/signal_cluster_view.xml
+++ b/packages/SystemUI/res/layout/signal_cluster_view.xml
@@ -48,7 +48,7 @@
             android:id="@+id/wifi_inout"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_gravity="center|bottom"
+            android:layout_gravity="center_horizontal|bottom"
             />
     </FrameLayout>
     <View
@@ -61,17 +61,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/data_combo"
-        android:visibility="gone"
+        android:visibility="visible"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout
diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml
index caae11db2d8df..aaa21b93594f1 100644
--- a/packages/SystemUI/res/values/arrays.xml
+++ b/packages/SystemUI/res/values/arrays.xml
@@ -199,7 +199,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -214,7 +214,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_e_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -229,7 +229,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_2g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -244,7 +244,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_3g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -259,7 +259,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_4g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -274,7 +274,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_h_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -289,7 +289,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_hp_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -304,7 +304,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_1x_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -319,7 +319,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_lte_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java
index 47223134365b1..08de53ec3014d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java
@@ -1090,16 +1090,16 @@ protected void refreshViews(int phoneId) {
 
                 switch (mWifiActivity) {
                     case WifiManager.DATA_ACTIVITY_IN:
-                        mWifiActivityIconId = R.drawable.stat_sys_wifi_in;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_in;
                         break;
                     case WifiManager.DATA_ACTIVITY_OUT:
-                        mWifiActivityIconId = R.drawable.stat_sys_wifi_out;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_out;
                         break;
                     case WifiManager.DATA_ACTIVITY_INOUT:
-                        mWifiActivityIconId = R.drawable.stat_sys_wifi_inout;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_inout;
                         break;
                     case WifiManager.DATA_ACTIVITY_NONE:
-                        mWifiActivityIconId = 0;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_none;
                         break;
                 }
             }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 759c930c267d9..17f389a26992a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -1336,16 +1336,16 @@ void refreshViews() {
                 }
                 switch (mWifiActivity) {
                 case WifiManager.DATA_ACTIVITY_IN:
-                    mWifiActivityIconId = R.drawable.stat_sys_wifi_in;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_in;
                     break;
                 case WifiManager.DATA_ACTIVITY_OUT:
-                    mWifiActivityIconId = R.drawable.stat_sys_wifi_out;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_out;
                     break;
                 case WifiManager.DATA_ACTIVITY_INOUT:
-                    mWifiActivityIconId = R.drawable.stat_sys_wifi_inout;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_inout;
                     break;
                 case WifiManager.DATA_ACTIVITY_NONE:
-                    mWifiActivityIconId = 0;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_none;
                     break;
                 }
             }