diff --git a/data/themes/default.edc b/data/themes/default.edc
index e7abdf5bd..70015f63a 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -7902,6 +7902,22 @@ collections {
             } \
          }
 
+#define CONNMAN_IMAGES_SET(_name, _min) \
+         images { \
+            set { \
+               name: "connman_"##_name; \
+               image { \
+                  image: "connman_"##_name##"_128.png" COMP; \
+                  size: (_min+1) (_min+1) 1000 1000; \
+               } \
+               image { \
+                  image: "connman_"##_name##"_32.png" COMP; \
+                  size: 1 1 _min _min; \
+               } \
+            } \
+         } \
+
+
 #define CONNMAN_ICON(_icon) \
    group { \
       name: "e/modules/connman/icon/"##_icon; \
@@ -7929,6 +7945,7 @@ collections {
          } \
       } \
       parts { \
+         CONNMAN_IMAGES_SET(_icon, 32) \
          part { \
             name: "icon"; \
             type: IMAGE; \
@@ -7937,8 +7954,7 @@ collections {
                state: "default" 0.0; \
                aspect: 1 1; \
                aspect_preference: BOTH; \
-               image.image: "connman_"##_icon##".png" COMP; \
-               image.normal: "connman_"##_icon##".png"; \
+               image.normal: "connman_"##_icon##; \
             } \
             description { \
                state: "hidden" 0.0; \
@@ -7972,21 +7988,6 @@ CONNMAN_ICON(ethernet)
 
 #undef CONNMAN_ICON
 
-#define CONNMAN_IMAGES_SET(_name, _min) \
-         images { \
-            set { \
-               name: "connman_"##_name; \
-               image { \
-                  image: "connman_"##_name##"_128.png" COMP; \
-                  size: (_min+1) (_min+1) 1000 1000; \
-               } \
-               image { \
-                  image: "connman_"##_name##"_32.png" COMP; \
-                  size: 1 1 _min _min; \
-               } \
-            } \
-         } \
-
    group {
       name: "e/modules/connman/icon/wifi";
 
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 0b91ee188..afaa06e38 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -74,9 +74,12 @@ ch-m2-3.png \
 ch-s1-3.png \
 ch-s2-3.png \
 clock_base.png \
-connman_bluetooth.png \
-connman_cellular.png \
-connman_ethernet.png \
+connman_bluetooth_128.png \
+connman_bluetooth_32.png \
+connman_cellular_128.png \
+connman_cellular_32.png \
+connman_ethernet_128.png \
+connman_ethernet_32.png \
 connman_security1_128.png \
 connman_security1_32.png \
 connman_security2_128.png \
diff --git a/data/themes/images/connman_bluetooth.png b/data/themes/images/connman_bluetooth_128.png
similarity index 100%
rename from data/themes/images/connman_bluetooth.png
rename to data/themes/images/connman_bluetooth_128.png
diff --git a/data/themes/images/connman_bluetooth_32.png b/data/themes/images/connman_bluetooth_32.png
new file mode 100644
index 000000000..a72f75b02
Binary files /dev/null and b/data/themes/images/connman_bluetooth_32.png differ
diff --git a/data/themes/images/connman_cellular.png b/data/themes/images/connman_cellular_128.png
similarity index 100%
rename from data/themes/images/connman_cellular.png
rename to data/themes/images/connman_cellular_128.png
diff --git a/data/themes/images/connman_cellular_32.png b/data/themes/images/connman_cellular_32.png
new file mode 100644
index 000000000..7db8ff655
Binary files /dev/null and b/data/themes/images/connman_cellular_32.png differ
diff --git a/data/themes/images/connman_ethernet.png b/data/themes/images/connman_ethernet_128.png
similarity index 100%
rename from data/themes/images/connman_ethernet.png
rename to data/themes/images/connman_ethernet_128.png
diff --git a/data/themes/images/connman_ethernet_32.png b/data/themes/images/connman_ethernet_32.png
new file mode 100644
index 000000000..6c19bfe6c
Binary files /dev/null and b/data/themes/images/connman_ethernet_32.png differ