diff --git a/data/themes/default.edc b/data/themes/default.edc
index 0149abf37..68e99fa0d 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -7901,23 +7901,27 @@ CONNMAN_ICON(ethernet)
 
 #define MSG_ID_STRENGTH 1
 
-#define CONNMAN_BAR_OFF(_num) \
-         part { \
-            name: "bar_"##_num##"_off"; \
-            type: IMAGE; \
-            mouse_events: 0; \
-            description { \
-               state: "default" 0.0; \
-               aspect: 1 1; \
-               aspect_preference: BOTH; \
-               image.image: "connman_wifi_"##_num##"_off.png" COMP; \
-               image.normal: "connman_wifi_"##_num##"_off.png"; \
+#define CONNMAN_BAR_IMAGES_SET(_name) \
+         images { \
+            set { \
+               name: "wifi_bar_"##_name; \
+               image { \
+                  image: "connman_wifi_"##_name##"_128.png" COMP; \
+                  /* FIXME: check why it doesn't work */ \
+                  /* size: 33 33 128 128; \ */ \
+                  size: 33 33 1000 1000; \
+               } \
+               image { \
+                  image: "connman_wifi_"##_name##"_32.png" COMP; \
+                  size: 1 1 32 32; \
+               } \
             } \
-         }
+         } \
 
-#define CONNMAN_BAR_ON(_num) \
+#define CONNMAN_BAR_ON(_name) \
+         CONNMAN_BAR_IMAGES_SET(_name) \
          part { \
-            name: "bar_"##_num##"_on"; \
+            name: "bar_"##_name; \
             type: IMAGE; \
             mouse_events: 0; \
             description { \
@@ -7925,8 +7929,7 @@ CONNMAN_ICON(ethernet)
                aspect: 1 1; \
                aspect_preference: BOTH; \
                color: 255 255 255 0; \
-               image.image: "connman_wifi_"##_num##"_on.png" COMP; \
-               image.normal: "connman_wifi_"##_num##"_on.png"; \
+               image.normal: "wifi_bar_"##_name; \
             } \
             description { \
                state: "visible" 0.0; \
@@ -7984,14 +7987,25 @@ CONNMAN_ICON(ethernet)
       }
 
       parts {
-         CONNMAN_BAR_OFF(0)
-         CONNMAN_BAR_OFF(1)
-         CONNMAN_BAR_OFF(2)
-         CONNMAN_BAR_OFF(3)
-         CONNMAN_BAR_ON(0)
-         CONNMAN_BAR_ON(1)
-         CONNMAN_BAR_ON(2)
-         CONNMAN_BAR_ON(3)
+
+         CONNMAN_BAR_IMAGES_SET(off)
+         part {
+            name: "bar_off";
+            type: IMAGE;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               aspect: 1 1;
+               aspect_preference: BOTH;
+               image.normal: "wifi_bar_off";
+            }
+         }
+
+         CONNMAN_BAR_ON(0_on)
+         CONNMAN_BAR_ON(1_on)
+         CONNMAN_BAR_ON(2_on)
+         CONNMAN_BAR_ON(3_on)
+
          part {
             name: "e.text.strength";
             type: TEXT;
@@ -8086,7 +8100,7 @@ CONNMAN_ICON(ethernet)
          CONNMAN_CONNECTING_OFF(3)
       }
 
-#undef CONNMAN_BAR_OFF
+#undef CONNMAN_BAR_IMAGES_SET
 #undef CONNMAN_BAR_ON
 #undef CONNMAN_CONNECTING_ON
 #undef CONNMAN_CONNECTING_OFF
diff --git a/data/themes/images/connman_wifi_0_off.png b/data/themes/images/connman_wifi_0_off.png
deleted file mode 100644
index 8103bd405..000000000
Binary files a/data/themes/images/connman_wifi_0_off.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_0_on.png b/data/themes/images/connman_wifi_0_on.png
deleted file mode 100644
index 525fd625b..000000000
Binary files a/data/themes/images/connman_wifi_0_on.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_0_on_128.png b/data/themes/images/connman_wifi_0_on_128.png
new file mode 100644
index 000000000..d740d744d
Binary files /dev/null and b/data/themes/images/connman_wifi_0_on_128.png differ
diff --git a/data/themes/images/connman_wifi_0_on_32.png b/data/themes/images/connman_wifi_0_on_32.png
new file mode 100644
index 000000000..771e17325
Binary files /dev/null and b/data/themes/images/connman_wifi_0_on_32.png differ
diff --git a/data/themes/images/connman_wifi_1_off.png b/data/themes/images/connman_wifi_1_off.png
deleted file mode 100644
index 0d59e2a6d..000000000
Binary files a/data/themes/images/connman_wifi_1_off.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_1_on.png b/data/themes/images/connman_wifi_1_on.png
deleted file mode 100644
index baf856a9d..000000000
Binary files a/data/themes/images/connman_wifi_1_on.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_1_on_128.png b/data/themes/images/connman_wifi_1_on_128.png
new file mode 100644
index 000000000..c98f93eb5
Binary files /dev/null and b/data/themes/images/connman_wifi_1_on_128.png differ
diff --git a/data/themes/images/connman_wifi_1_on_32.png b/data/themes/images/connman_wifi_1_on_32.png
new file mode 100644
index 000000000..b8dd1a6c4
Binary files /dev/null and b/data/themes/images/connman_wifi_1_on_32.png differ
diff --git a/data/themes/images/connman_wifi_2_off.png b/data/themes/images/connman_wifi_2_off.png
deleted file mode 100644
index c19ca586d..000000000
Binary files a/data/themes/images/connman_wifi_2_off.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_2_on.png b/data/themes/images/connman_wifi_2_on.png
deleted file mode 100644
index 0f9b45385..000000000
Binary files a/data/themes/images/connman_wifi_2_on.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_2_on_128.png b/data/themes/images/connman_wifi_2_on_128.png
new file mode 100644
index 000000000..74436a034
Binary files /dev/null and b/data/themes/images/connman_wifi_2_on_128.png differ
diff --git a/data/themes/images/connman_wifi_2_on_32.png b/data/themes/images/connman_wifi_2_on_32.png
new file mode 100644
index 000000000..c9431776b
Binary files /dev/null and b/data/themes/images/connman_wifi_2_on_32.png differ
diff --git a/data/themes/images/connman_wifi_3_off.png b/data/themes/images/connman_wifi_3_off.png
deleted file mode 100644
index ec35009dc..000000000
Binary files a/data/themes/images/connman_wifi_3_off.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_3_on.png b/data/themes/images/connman_wifi_3_on.png
deleted file mode 100644
index 2b159874a..000000000
Binary files a/data/themes/images/connman_wifi_3_on.png and /dev/null differ
diff --git a/data/themes/images/connman_wifi_3_on_128.png b/data/themes/images/connman_wifi_3_on_128.png
new file mode 100644
index 000000000..6c44eba71
Binary files /dev/null and b/data/themes/images/connman_wifi_3_on_128.png differ
diff --git a/data/themes/images/connman_wifi_3_on_32.png b/data/themes/images/connman_wifi_3_on_32.png
new file mode 100644
index 000000000..f0859a75a
Binary files /dev/null and b/data/themes/images/connman_wifi_3_on_32.png differ
diff --git a/data/themes/images/connman_wifi_off_128.png b/data/themes/images/connman_wifi_off_128.png
new file mode 100644
index 000000000..64707b493
Binary files /dev/null and b/data/themes/images/connman_wifi_off_128.png differ
diff --git a/data/themes/images/connman_wifi_off_32.png b/data/themes/images/connman_wifi_off_32.png
new file mode 100644
index 000000000..8b6c50e98
Binary files /dev/null and b/data/themes/images/connman_wifi_off_32.png differ