diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 6af2e7485fe..7f8209d168b 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -223,11 +223,15 @@ footer {
 }
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
-.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
+.oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
   background-image: url("/website/static/src/img/drag_here.png");
+}
+
+.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
+  background-image: url("/website/static/src/img/edit_here.png");
   background-repeat: no-repeat;
-  background-position: center top;
-  height: 200px !important;
+  background-position: center;
+  height: 220px !important;
 }
 
 .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
@@ -238,8 +242,8 @@ footer {
   content: "Click Edit To Create Content";
   text-align: center;
   display: block;
-  padding-top: 100px;
-  padding-bottom: 50px;
+  padding-top: 160px;
+  padding-bottom: 30px;
   color: grey;
   font-size: 24px;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 997b45a0253..270141fc9a6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -151,11 +151,14 @@ footer
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
-.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
+.oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
     background-image: url('/website/static/src/img/drag_here.png')
+
+.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
+    background-image: url('/website/static/src/img/edit_here.png')
     background-repeat: no-repeat
-    background-position: center top
-    height: 200px !important
+    background-position: center
+    height: 220px !important
 
 .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
     position: static
@@ -164,8 +167,8 @@ footer
     content: 'Click Edit To Create Content'
     text-align: center
     display: block
-    padding-top: 100px
-    padding-bottom: 50px
+    padding-top: 160px
+    padding-bottom: 30px
     color: grey
     font-size: 24px
 
diff --git a/addons/website/static/src/img/drag_here.png b/addons/website/static/src/img/drag_here.png
index f2e3d38b2df..0dfeb1bc5da 100644
Binary files a/addons/website/static/src/img/drag_here.png and b/addons/website/static/src/img/drag_here.png differ
diff --git a/addons/website/static/src/img/edit_here.png b/addons/website/static/src/img/edit_here.png
new file mode 100644
index 00000000000..b53f56e2ac8
Binary files /dev/null and b/addons/website/static/src/img/edit_here.png differ