diff --git a/data/themes/default.edc b/data/themes/default.edc
index 68e99fa0d..f9a8d54f6 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -7896,6 +7896,21 @@ CONNMAN_ICON(ethernet)
 
 #undef CONNMAN_ICON
 
+#define CONNMAN_IMAGES_SET(_name) \
+         images { \
+            set { \
+               name: "connman_"##_name; \
+               image { \
+                  image: "connman_"##_name##"_128.png" COMP; \
+                  size: 33 33 1000 1000; \
+               } \
+               image { \
+                  image: "connman_"##_name##"_32.png" COMP; \
+                  size: 1 1 32 32; \
+               } \
+            } \
+         } \
+
    group {
       name: "e/modules/connman/icon/wifi";
 
@@ -8135,6 +8150,10 @@ CONNMAN_ICON(ethernet)
 
    group {
       name: "e/modules/connman/end";
+
+      CONNMAN_IMAGES_SET(security1)
+      CONNMAN_IMAGES_SET(security2)
+
       parts {
          part {
             name: "state";
@@ -8172,27 +8191,18 @@ CONNMAN_ICON(ethernet)
                aspect_preference: BOTH;
                color: 255 255 255 0;
                rel1.relative: 0.3 0;
-               image.image: "connman_unsecure.png" COMP;
-               image.normal: "connman_unsecure.png";
-            }
-            description {
-               state: "unsecure" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
+               image.normal: "connman_security1";
             }
             description {
                state: "almost_secure" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 255;
-               image.image: "connman_almost_secure.png" COMP;
-               image.normal: "connman_almost_secure.png";
             }
             description {
                state: "secure" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 255;
-               image.image: "connman_secure.png" COMP;
-               image.normal: "connman_secure.png";
+               image.normal: "connman_security2";
             }
          }
       }
@@ -8229,7 +8239,7 @@ CONNMAN_ICON(ethernet)
             name: "security,none";
             signal: "e,security,none";
             source: "e";
-            action: STATE_SET "unsecure" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "security";
          }
          program {
@@ -8249,6 +8259,7 @@ CONNMAN_ICON(ethernet)
       }
    }
 
+#undef CONNMAN_IMAGES_SET
 
 /////////////////////////////////////////////////////////////////////////////
 /*** MOD: BLUEZ ***/
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 4f46a2979..2795a2658 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -74,23 +74,26 @@ ch-m2-3.png \
 ch-s1-3.png \
 ch-s2-3.png \
 clock_base.png \
-connman_almost_secure.png \
 connman_bluetooth.png \
 connman_cellular.png \
 connman_ethernet.png \
 connman_online.png \
 connman_ready.png \
-connman_secure.png \
-connman_unsecure.png \
-connman_wifi_0_off.png \
-connman_wifi_0_on.png \
-connman_wifi_1_off.png \
-connman_wifi_1_on.png \
-connman_wifi_2_off.png \
-connman_wifi_2_on.png \
-connman_wifi_3_off.png \
-connman_wifi_3_on.png \
 connman_wifi_not.png \
+connman_security1_128.png \
+connman_security1_32.png \
+connman_security2_128.png \
+connman_security2_32.png \
+connman_wifi_0_on_128.png \
+connman_wifi_0_on_32.png \
+connman_wifi_1_on_128.png \
+connman_wifi_1_on_32.png \
+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_off_128.png \
+connman_wifi_off_32.png \
 dia_botshad.png \
 dia_grad.png \
 dia_topshad.png \
diff --git a/data/themes/images/connman_almost_secure.png b/data/themes/images/connman_almost_secure.png
deleted file mode 100644
index feef034c7..000000000
Binary files a/data/themes/images/connman_almost_secure.png and /dev/null differ
diff --git a/data/themes/images/connman_secure.png b/data/themes/images/connman_secure.png
deleted file mode 100644
index 57a0bb1d4..000000000
Binary files a/data/themes/images/connman_secure.png and /dev/null differ
diff --git a/data/themes/images/connman_security1_128.png b/data/themes/images/connman_security1_128.png
new file mode 100644
index 000000000..7163ff646
Binary files /dev/null and b/data/themes/images/connman_security1_128.png differ
diff --git a/data/themes/images/connman_security1_32.png b/data/themes/images/connman_security1_32.png
new file mode 100644
index 000000000..a3944cc4f
Binary files /dev/null and b/data/themes/images/connman_security1_32.png differ
diff --git a/data/themes/images/connman_security2_128.png b/data/themes/images/connman_security2_128.png
new file mode 100644
index 000000000..cd99a02d3
Binary files /dev/null and b/data/themes/images/connman_security2_128.png differ
diff --git a/data/themes/images/connman_security2_32.png b/data/themes/images/connman_security2_32.png
new file mode 100644
index 000000000..6d048c5fd
Binary files /dev/null and b/data/themes/images/connman_security2_32.png differ
diff --git a/data/themes/images/connman_unsecure.png b/data/themes/images/connman_unsecure.png
deleted file mode 100644
index 3aa1c2dbf..000000000
Binary files a/data/themes/images/connman_unsecure.png and /dev/null differ