diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am
index 3b78e72..4376181 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -40,7 +40,6 @@ EXTRA_DIST = \
    sym_up_light_normal.png \
    vgrad_med_lighter.png \
    warning.png \
-   pm_fill.png \
    menu.png \
    find.png \
    highlight.png \
@@ -69,18 +68,19 @@ EXTRA_DIST = \
    white_bar_vert_glow.png \
    horizontal_separated_bar_small_glow.png \
    expand.png \
-	invert.png \
-	icon_close.png \
+   invert.png \
+   icon_close.png \
    file_browser.png \
    edc_navigator.png \
-	cursor_arrow.png \
-	navi_group.png \
-	navi_image.png \
-	navi_rect.png \
-	navi_swallow.png \
-	navi_text.png \
-	navi_textblock.png \
-	navi_spacer.png \
-	navi_unknown.png \
-	navi_state.png \
-	navi_program.png
+   cursor_arrow.png \
+   navi_group.png \
+   navi_image.png \
+   navi_rect.png \
+   navi_swallow.png \
+   navi_text.png \
+   navi_textblock.png \
+   navi_spacer.png \
+   navi_unknown.png \
+   navi_state.png \
+   navi_program.png \
+   bg_demo.png
diff --git a/data/themes/default/images/bg_demo.png b/data/themes/default/images/bg_demo.png
new file mode 100644
index 0000000..5691144
Binary files /dev/null and b/data/themes/default/images/bg_demo.png differ
diff --git a/data/themes/default/images/pm_fill.png b/data/themes/default/images/pm_fill.png
deleted file mode 100644
index 8ef098f..0000000
Binary files a/data/themes/default/images/pm_fill.png and /dev/null differ
diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc
index 88a630e..ccd25be 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -7,10 +7,10 @@ images {
    image: "bub_over_bot.png" COMP;
    image: "disabler.png" COMP;
    image: "bevel_out.png" COMP;
-   image: "pm_fill.png" COMP;
    image: "full_logo.png" COMP;
    image: "cursor_arrow.png" COMP;
    image: "navi_group.png" COMP;
+   image: "bg_demo.png" COMP;
 }
 
 group { name: "about_layout";
@@ -1413,28 +1413,19 @@ group { name: "live_edit_layout";
 
 group { name: "viewer_layout_bg";
    parts {
-      part { name: "clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-         }
-      }
-      part { name: "bg";
-         type: IMAGE;
-         description { state: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            image.normal: "pm_fill.png";
+      image { "bg"; nomouse;
+         desc { "default";
+            image.normal: "bg_demo.png";
             fill {
                size.relative: 0 0;
-               size.offset: 64 64;
+               size.offset: 16 16;
             }
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
          }
       }
       part { name: "elm.swallow.content";
          type: SWALLOW;
-         clip_to: "clipper";
          description { state: "default" 0.0;
          }
       }