diff --git a/data/themes/default.edc b/data/themes/default.edc
index f9a8d54f6..4f2d082ff 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -8004,6 +8004,7 @@ CONNMAN_ICON(ethernet)
       parts {
 
          CONNMAN_BAR_IMAGES_SET(off)
+         CONNMAN_BAR_IMAGES_SET(not)
          part {
             name: "bar_off";
             type: IMAGE;
@@ -8014,6 +8015,11 @@ CONNMAN_ICON(ethernet)
                aspect_preference: BOTH;
                image.normal: "wifi_bar_off";
             }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+            }
          }
 
          CONNMAN_BAR_ON(0_on)
@@ -8051,12 +8057,11 @@ CONNMAN_ICON(ethernet)
                state: "default" 0.0;
                aspect: 1 1;
                aspect_preference: BOTH;
-               image.image: "connman_wifi_not.png" COMP;
-               image.normal: "connman_wifi_not.png";
+               image.normal: "wifi_bar_not";
                color: 255 255 255 0;
             }
             description {
-               state: "visible" 0.0;
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 255;
             }
@@ -8069,6 +8074,7 @@ CONNMAN_ICON(ethernet)
             source: "e";
             action: STATE_SET "default" 0.0;
             target: "bar_not";
+            target: "bar_off";
          }
          program {
             name: "connman,disabled";
@@ -8082,8 +8088,9 @@ CONNMAN_ICON(ethernet)
          }
          program {
             name: "connman,disabled,2";
-            action: STATE_SET "visible" 0.0;
+            action: STATE_SET "disabled" 0.0;
             target: "bar_not";
+            target: "bar_off";
          }
          program {
             name: "strength,show";
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 2795a2658..30bb8a00c 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -79,7 +79,6 @@ connman_cellular.png \
 connman_ethernet.png \
 connman_online.png \
 connman_ready.png \
-connman_wifi_not.png \
 connman_security1_128.png \
 connman_security1_32.png \
 connman_security2_128.png \
@@ -92,6 +91,8 @@ connman_wifi_2_on_128.png \
 connman_wifi_2_on_32.png \
 connman_wifi_3_on_128.png \
 connman_wifi_3_on_32.png \
+connman_wifi_not_128.png \
+connman_wifi_not_32.png \
 connman_wifi_off_128.png \
 connman_wifi_off_32.png \
 dia_botshad.png \
diff --git a/data/themes/images/connman_wifi_not.png b/data/themes/images/connman_wifi_not.png
deleted file mode 100644
index 27ec5ba43..000000000
Binary files a/data/themes/images/connman_wifi_not.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_not_128.png b/data/themes/images/connman_wifi_not_128.png
new file mode 100644
index 000000000..22a290ded
Binary files /dev/null and b/data/themes/images/connman_wifi_not_128.png differ
diff --git a/data/themes/images/connman_wifi_not_32.png b/data/themes/images/connman_wifi_not_32.png
new file mode 100644
index 000000000..7298ee339
Binary files /dev/null and b/data/themes/images/connman_wifi_not_32.png differ