diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index 7b7389b..d5ccd53 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -21,6 +21,7 @@ images {
    image: "live_rectangle.png" COMP;
    image: "live_swallow.png" COMP;
    image: "live_spacer.png" COMP;
+   image: "live_spacer_icon.png" COMP;
    image: "live_text.png" COMP;
    image: "live_textblock.png" COMP;
    image: "expand.png" COMP;
@@ -75,6 +76,7 @@ ICON_GROUP("invert", "invert.png")
 ICON_GROUP("Image", "live_image.png")
 ICON_GROUP("Rect", "live_rectangle.png")
 ICON_GROUP("Spacer", "live_spacer.png")
+ICON_GROUP("Spacer_Icon", "live_spacer_icon.png")
 ICON_GROUP("Swallow", "live_swallow.png")
 ICON_GROUP("Text", "live_text.png")
 ICON_GROUP("Textblock", "live_textblock.png")
diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am
index 7cfb2fe..563c471 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -56,6 +56,7 @@ EXTRA_DIST = \
    live_rectangle.png \
    live_swallow.png \
    live_spacer.png \
+   live_spacer_icon.png \
    live_text.png \
    live_textblock.png \
    new.png \
diff --git a/data/themes/default/images/live_spacer.png b/data/themes/default/images/live_spacer.png
index 8aa75fa..b2821c6 100644
Binary files a/data/themes/default/images/live_spacer.png and b/data/themes/default/images/live_spacer.png differ
diff --git a/data/themes/default/images/live_spacer_icon.png b/data/themes/default/images/live_spacer_icon.png
new file mode 100644
index 0000000..8aa75fa
Binary files /dev/null and b/data/themes/default/images/live_spacer_icon.png differ
diff --git a/data/themes/default/images/spacer.png b/data/themes/default/images/spacer.png
deleted file mode 100644
index 8e3a034..0000000
Binary files a/data/themes/default/images/spacer.png and /dev/null differ
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index c3f699f..7713ba7 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -120,7 +120,7 @@ static const liveedit_item LIVEEDIT_ITEMS[] =
      {"Image", EDJE_PART_TYPE_IMAGE},
      {"Swallow", EDJE_PART_TYPE_SWALLOW},
      {"Textblock", EDJE_PART_TYPE_TEXTBLOCK},
-     {"Spacer", EDJE_PART_TYPE_SPACER}
+     {"Spacer", EDJE_PART_TYPE_SPACER} //Please leave spacer at last
 };
 
 static Evas_Object *
@@ -2005,13 +2005,19 @@ live_edit_tools_create(Evas_Object *parent)
    Evas_Object *btn;
    int i;
 
-   for (i = 0; i < LIVEEDIT_ITEMS_NUM; i++)
+   for (i = 0; i < (LIVEEDIT_ITEMS_NUM - 1); i++)
      {
         btn = live_btn_create(parent, LIVEEDIT_ITEMS[i].name,
                               (void *)(uintptr_t) i);
         btn_list = eina_list_append(btn_list, btn);
      }
 
+   //Just for spacer. Because we'd like to avoid margin in the icon image,
+   //We use 2 images - button icon's and live edit object's.
+   btn = live_btn_create(parent, "Spacer_Icon",
+                         (void *)(uintptr_t) i);
+   btn_list = eina_list_append(btn_list, btn);
+
    return btn_list;
 }