diff --git a/data/images/ENVENTOR_EMBEDDED_IMAGE.png b/data/images/ENVENTOR_EMBEDDED_IMAGE.png
new file mode 100644
index 0000000..09badf2
Binary files /dev/null and b/data/images/ENVENTOR_EMBEDDED_IMAGE.png differ
diff --git a/data/images/ENVENTOR_EMBEDDED_LOGO.png b/data/images/ENVENTOR_EMBEDDED_LOGO.png
deleted file mode 100644
index a6da587..0000000
Binary files a/data/images/ENVENTOR_EMBEDDED_LOGO.png and /dev/null differ
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 0e1e3e4..fb0f3d1 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 filesdir = $(datadir)/$(PACKAGE)/images
-files_DATA = ENVENTOR_EMBEDDED_LOGO.png \
+files_DATA = ENVENTOR_EMBEDDED_IMAGE.png \
              ENVENTOR_EMBEDDED_TRIAB-01.png \
              ENVENTOR_EMBEDDED_TRIAB-02.png \
              ENVENTOR_EMBEDDED_TRIAB-03.png \
@@ -13,6 +13,7 @@ files_DATA = ENVENTOR_EMBEDDED_LOGO.png \
              ENVENTOR_EMBEDDED_TRIAB-09.png \
              ENVENTOR_EMBEDDED_TRIAB-10.png \
              ENVENTOR_EMBEDDED_TRIAB-11.png \
-             ENVENTOR_EMBEDDED_TRIAB-12.png
+             ENVENTOR_EMBEDDED_TRIAB-12.png \
+				 enventor_logo.png
 
 EXTRA_DIST = $(files_DATA)
diff --git a/data/images/enventor_logo.png b/data/images/enventor_logo.png
new file mode 100644
index 0000000..725990a
Binary files /dev/null and b/data/images/enventor_logo.png differ
diff --git a/data/templates/basic.edc b/data/templates/basic.edc
index 2001744..c357c45 100644
--- a/data/templates/basic.edc
+++ b/data/templates/basic.edc
@@ -3,7 +3,7 @@ collections {
    group { "main";
       /* TODO: Please replace embedded image files to your application image files. */
       images {
-         image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;
+         image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
       }
       parts {
          image { "logo";
@@ -11,7 +11,7 @@ collections {
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.5 0.5;
                /* TODO: Please replace embedded image files to your application image files. */
-               image.normal: "ENVENTOR_EMBEDDED_LOGO.png";
+               image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
                aspect: 1 1;
                aspect_preference: BOTH;
             }
diff --git a/data/templates/clip.edc b/data/templates/clip.edc
index d238ab8..bc2c166 100644
--- a/data/templates/clip.edc
+++ b/data/templates/clip.edc
@@ -3,7 +3,7 @@ collections {
    group { "main";
       /* TODO: Please replace embedded image files to your application image files. */
       images {
-         image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;
+         image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
       }
       parts {
          rect { "clipper";
@@ -19,7 +19,7 @@ collections {
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 1.0;
                /* TODO: Please replace embedded image files to your application image files. */
-               image.normal: "ENVENTOR_EMBEDDED_LOGO.png";
+               image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
                aspect: 1 1;
                aspect_preference: BOTH;
             }
diff --git a/data/templates/image.edc b/data/templates/image.edc
index 3521a12..cbfffcb 100644
--- a/data/templates/image.edc
+++ b/data/templates/image.edc
@@ -3,7 +3,7 @@ collections {
    group { "main";
       /* TODO: Please replace embedded image files to your application image files. */
       images {
-         image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;
+         image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
       }
       parts {
          image { "logo";
@@ -11,7 +11,7 @@ collections {
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 1.0;
                /* TODO: Please replace embedded image files to your application image files. */
-               image.normal: "ENVENTOR_EMBEDDED_LOGO.png";
+               image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
                aspect: 1 1;
                aspect_preference: BOTH;
             }
diff --git a/data/templates/map.edc b/data/templates/map.edc
index 4dc7bc6..37bef80 100644
--- a/data/templates/map.edc
+++ b/data/templates/map.edc
@@ -3,7 +3,7 @@ collections {
    group { "main";
       /* TODO: Please replace embedded image files to your application image files. */
       images {
-         image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;
+         image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
       }
       parts {
          image { "logo";
@@ -11,7 +11,7 @@ collections {
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.5 0.5;
                /* TODO: Please replace embedded image files to your application image files. */
-               image.normal: "ENVENTOR_EMBEDDED_LOGO.png";
+               image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
                aspect: 1 1;
                aspect_preference: BOTH;
                map.on: 1;
diff --git a/data/templates/proxy.edc b/data/templates/proxy.edc
index 779c62b..e3dd846 100644
--- a/data/templates/proxy.edc
+++ b/data/templates/proxy.edc
@@ -3,7 +3,7 @@ collections {
    group { "main";
       /* TODO: Please replace embedded image files to your application image files. */
       images {
-         image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;
+         image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
       }
       parts {
          image { "logo";
@@ -11,7 +11,7 @@ collections {
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.5 0.5;
                /* TODO: Please replace embedded image files to your application image files. */
-               image.normal: "ENVENTOR_EMBEDDED_LOGO.png";
+               image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
                aspect: 1 1;
                aspect_preference: BOTH;
             }
diff --git a/data/templates/rotation+zoom.edc b/data/templates/rotation+zoom.edc
index 572851c..81ed649 100644
--- a/data/templates/rotation+zoom.edc
+++ b/data/templates/rotation+zoom.edc
@@ -3,13 +3,13 @@ collections {
    group { "main";
       /* TODO: Please replace embedded image files to your application image files. */
       images {
-         image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;
+         image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
       }
       parts {
          image { "logo";
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
-               image.normal: "ENVENTOR_EMBEDDED_LOGO.png";
+               image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
                aspect: 1 1;
                aspect_preference: BOTH;
                map.on: 1;
diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am
index e6d3ff2..4540b8d 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = \
    holes_tiny_horiz.png \
    holes_tiny_vert.png \
    inset_shadow.png \
-   logo.png \
+   image.png \
    full_logo.png \
    frame_bg.png \
    part_highlight.png \
diff --git a/data/themes/default/images/image.png b/data/themes/default/images/image.png
new file mode 100644
index 0000000..09badf2
Binary files /dev/null and b/data/themes/default/images/image.png differ
diff --git a/data/themes/default/images/logo.png b/data/themes/default/images/logo.png
deleted file mode 100644
index a6da587..0000000
Binary files a/data/themes/default/images/logo.png and /dev/null differ
diff --git a/data/themes/default/live_edit.edc b/data/themes/default/live_edit.edc
index afd87b5..ce5ea04 100644
--- a/data/themes/default/live_edit.edc
+++ b/data/themes/default/live_edit.edc
@@ -1,7 +1,7 @@
 images {
    image: "live_spacer.png" COMP;
    image: "swallow.png" COMP;
-   image: "logo.png" COMP;
+   image: "image.png" COMP;
 
 }
 
@@ -15,7 +15,7 @@ group { "Image_bg";
    parts {
       image { name: "img";
          desc {
-            image.normal: "logo.png";
+            image.normal: "image.png";
          }
       }
    }
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index eb1f8a7..32bff9a 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -304,7 +304,7 @@ base_gui_init(void)
 
    //Window icon
    Evas_Object *icon = evas_object_image_add(evas_object_evas_get(win));
-   snprintf(buf, sizeof(buf), "%s/images/ENVENTOR_EMBEDDED_LOGO.png",
+   snprintf(buf, sizeof(buf), "%s/images/enventor_logo.png",
             elm_app_data_dir_get());
    evas_object_image_file_set(icon, buf, NULL);
    elm_win_icon_object_set(win, icon);
diff --git a/src/bin/main.c b/src/bin/main.c
index b269f48..7c4a801 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -404,7 +404,7 @@ elm_setup()
    elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
    elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
    elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
-   elm_app_info_set(main, "enventor", "images/ENVENTOR_EMBEDDED_LOGO.png");
+   elm_app_info_set(main, "enventor", "images/enventor_logo.png");
 
    snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj",
             elm_app_data_dir_get());
diff --git a/src/lib/template_code.h b/src/lib/template_code.h
index 8bc919a..4e8fb1c 100644
--- a/src/lib/template_code.h
+++ b/src/lib/template_code.h
@@ -4,7 +4,7 @@ const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] =
 {
    "   /* TODO: Please replace embedded image files to your application image files. */<br/>",
    "   images {<br/>",
-   "      image: \"ENVENTOR_EMBEDDED_LOGO.png\" COMP;<br/>",
+   "      image: \"ENVENTOR_EMBEDDED_IMAGE.png\" COMP;<br/>",
    "   }<br/>",
    "   parts {<br/>",
    "      image { \"XXX\";<br/>",
@@ -17,7 +17,7 @@ const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] =
    "            min: 0 0;<br/>",
    "            visible: 1;<br/>",
    "            /* TODO: Please replace embedded image files to your application image files. */<br/>",
-   "            image.normal: \"ENVENTOR_EMBEDDED_LOGO.png\";<br/>",
+   "            image.normal: \"ENVENTOR_EMBEDDED_IMAGE.png\";<br/>",
    "            //aspect: 1 1;<br/>",
    "         }<br/>",
    "      }<br/>",
@@ -50,7 +50,7 @@ const char *TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] =
    "   desc { \"default\";<br/>",
    "      visible: 1;<br/>",
    "      /* TODO: Please replace embedded image files to your application image files. */<br/>",
-   "      image.normal: \"ENVENTOR_EMBEDDED_LOGO.png\";<br/>",
+   "      image.normal: \"ENVENTOR_EMBEDDED_IMAGE.png\";<br/>",
    "      //aspect: 1 1;<br/>"
 };
 
@@ -154,7 +154,7 @@ const char *TEMPLATE_PROG[TEMPLATE_PROG_LINE_CNT] =
 
 const char *TEMPLATE_IMG[TEMPLATE_IMG_LINE_CNT] =
 {
-   "image: \"ENVENTOR_EMBEDDED_LOGO.png\" COMP;<br/>"
+   "image: \"ENVENTOR_EMBEDDED_IMAGE.png\" COMP;<br/>"
 };
 
 #define TEMPLATE_IMG_BLOCK_LINE_CNT 4
@@ -163,7 +163,7 @@ const char *TEMPLATE_IMG_BLOCK[TEMPLATE_IMG_BLOCK_LINE_CNT] =
 {
    "/* TODO: Please replace embedded image files to your application image files. */<br/>",
    "images {<br/>",
-   "   image: \"ENVENTOR_EMBEDDED_LOGO.png\" COMP;<br/>",
+   "   image: \"ENVENTOR_EMBEDDED_IMAGE.png\" COMP;<br/>",
    "}<br/>"
 };