diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml
index 95acebf9f06..8d0bda39196 100644
--- a/addons/website/views/website_navbar_templates.xml
+++ b/addons/website/views/website_navbar_templates.xml
@@ -85,7 +85,7 @@
                     <li t-if="not translatable" id="edit-page-menu">
                         <a data-action="edit" href="#"><span class="fa fa-pencil"/>Edit</a>
                     </li>
-                    <li t-if="'website_published' in main_object.fields_get()">
+                    <li t-if="'website_published' in main_object.fields_get() and main_object._name != 'website.page'">
                         <a class="btn btn-primary btn-xs dropdown-toggle css_edit_dynamic" data-toggle="dropdown">
                             <span class="caret"></span>
                             <span class="sr-only">Toggle Dropdown</span>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 8fcac493d6d..a99dfe936a6 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -861,7 +861,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                   </li>
               </ul>
           </div>
-          <h3 class="mt16">Manage your custom pages</h3>
+          <h3 class="mt16">Manage Your Pages</h3>
           <t t-if="not pages">
               <div t-if="search" class="alert alert-warning mt8" role="alert">
                   Your search '<t t-esc="search" />' did not match any pages.
@@ -892,7 +892,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                           <td class="text-center"><i t-att-class="'fa fa-check' if page.website_indexed else 'fa fa-times text-muted'" aria-hidden="true"></i></td>
                           <td class="text-right">
                               <a class="mr4 fa fa-lg fa-cog js_page_properties" t-att-data-id="page.id" href="#" title="Manage this page"></a>
-                              <a class="mr4 fa fa-lg fa-pencil-square-o" t-attf-href="/web#id=#{page.ir_ui_view_id.id}&amp;view_type=form&amp;model=ir.ui.view" title="Edit page content in backend"></a>
+                              <a class="mr4 fa fa-lg fa-pencil-square-o" t-attf-href="/web#id=#{page.ir_ui_view_id.id}&amp;view_type=form&amp;model=ir.ui.view" title="Edit code in backend"></a>
                               <a class="mr4 fa fa-lg fa-clone js_clone_page" t-att-data-id="page.id" href="#" title="Clone this page"></a>
                               <a class="fa fa-lg fa-trash js_delete_page" t-att-data-id="page.id" href="#" title="Delete this page"></a>
                           </td>