diff --git a/Makefile.am b/Makefile.am
index d1e2816..1c025d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ EXTRA_DIST = \
 	AUTHORS \
 	COPYING \
 	README \
-	autogen.sh
+	autogen.sh \
+	econnman-bin.in
 
 dist_bin_SCRIPTS = econnman-bin
 
@@ -29,7 +30,13 @@ am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
 am__v_EDJ_0 = @echo "  EDJ   " $@;
 
 THEME_IMAGES = \
+data/theme/connman-connected.png \
 data/theme/connman-ethernet.png \
+data/theme/connman-favorite.png \
+data/theme/connman-lock.png \
+data/theme/connman-tech-connected.png \
+data/theme/connman-tech-offline.png \
+data/theme/connman-tech-powered.png \
 data/theme/connman-wifi-bad.png \
 data/theme/connman-wifi-good.png \
 data/theme/connman-wifi-medium.png
@@ -47,6 +54,7 @@ data/theme/default.edj: $(top_builddir)/Makefile $(top_srcdir)/data/theme/defaul
 
 clean-local:
 	rm -f $(top_builddir)/data/theme/default.edj
+	rm -f $(top_builddir)/econnman-bin
 
 MAINTAINERCLEANFILES = \
 	aclocal.m4 \
diff --git a/data/theme/connman-connected.png b/data/theme/connman-connected.png
new file mode 100644
index 0000000..af60ec9
Binary files /dev/null and b/data/theme/connman-connected.png differ
diff --git a/data/theme/default.edc b/data/theme/default.edc
index b0d3052..f1d2c95 100644
--- a/data/theme/default.edc
+++ b/data/theme/default.edc
@@ -98,6 +98,7 @@ collections {
          image: "connman-wifi-bad.png" COMP;
          image: "connman-lock.png" COMP;
          image: "connman-favorite.png" COMP;
+         image: "connman-connected.png" COMP;
       }
       script {
          public message(Msg_Type:type, id, ...) {
@@ -172,6 +173,24 @@ collections {
             }
          }
 
+         part {
+            name: "connected";
+            type: IMAGE;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "connman-connected.png";
+               visible: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+
          programs {
             program {
                signal: "elm,security,yes";
@@ -199,6 +218,19 @@ collections {
                target: "favorite";
             }
 
+            program {
+               signal: "elm,connected,yes";
+               source: "elm";
+               action: STATE_SET "visible" 0.0;
+               target: "connected";
+            }
+            program {
+               signal: "elm,connected,none";
+               source: "elm";
+               action: STATE_SET "default" 0.0;
+               target: "connected";
+            }
+
             program {
                name: "strength,good";
                action: STATE_SET "default" 0.0;
diff --git a/econnman-bin.in b/econnman-bin.in
index 30b8078..704d167 100755
--- a/econnman-bin.in
+++ b/econnman-bin.in
@@ -662,6 +662,9 @@ class ServicesList(object):
         ly.signal_emit("elm,roaming," + yesno(roaming), "elm")
         ly.signal_emit("elm,auto_connect," + yesno(auto_connect), "elm")
 
+        connected = (str(state) not in ("idle", "failure"))
+        ly.signal_emit("elm,connected," + yesno(connected), "elm")
+
         for s in security:
             ly.signal_emit("elm,security," + s, "elm")
         if security: