diff --git a/addons/website/static/src/less/website.ui.less b/addons/website/static/src/less/website.ui.less
index 4ff9bfce6e3..01d76905dd8 100644
--- a/addons/website/static/src/less/website.ui.less
+++ b/addons/website/static/src/less/website.ui.less
@@ -21,23 +21,30 @@ body.o_connected_user {
     }
 
     .o_menu_systray {
-        a[data-action="edit"], a[data-action="translate"] {
-            background-color: @odoo-brand-optional;
-            outline: 1px solid @odoo-brand-optional;
-            &:hover, &:focus {
-                background-color: darken(@odoo-brand-optional, 10%);
-                outline-color: darken(@odoo-brand-optional, 10%);
+        a {
+            padding: 0 @grid-gutter-width/2;
+
+            &[data-action="edit"], &[data-action="translate"] {
+                background-color: @odoo-brand-optional;
+                outline: 1px solid @odoo-brand-optional;
+                &:hover, &:focus {
+                    background-color: darken(@odoo-brand-optional, 10%);
+                    outline-color: darken(@odoo-brand-optional, 10%);
+                }
+
+                @media (max-width: @screen-xs-max) {
+                    &, &:hover, &:focus {
+                        outline: none;
+                    }
+                }
             }
 
-            @media (max-width: @screen-xs-max) {
-                &, &:hover, &:focus {
-                    outline: none;
-                }
+            > .fa-plus, > .fa-pencil {
+                margin-right: @grid-gutter-width/4;
             }
         }
 
         .o_mobile_preview a {
-            width: @odoo-navbar-height - 2;
             text-align: center;
             font-size: 20px;
         }
diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml
index 7352ea232aa..31107d6281c 100644
--- a/addons/website/views/website_navbar_templates.xml
+++ b/addons/website/views/website_navbar_templates.xml
@@ -76,10 +76,10 @@
                     </li>
                     <!-- Page Edition -->
                     <li groups="base.group_website_publisher,base.group_website_designer">
-                        <a data-action="new_page" href="#" data-toggle="modal" data-target="#o_website_add_page_modal"><span class="fa fa-plus"/> NEW PAGE</a>
+                        <a data-action="new_page" href="#" data-toggle="modal" data-target="#o_website_add_page_modal"><span class="fa fa-plus"/>New</a>
                     </li>
                     <li t-if="not translatable" groups="base.group_website_publisher">
-                        <a data-action="edit" href="#"><span class="fa fa-pencil"/> EDIT PAGE</a>
+                        <a data-action="edit" href="#"><span class="fa fa-pencil"/>Edit</a>
                     </li>
                     <li t-if="translatable" groups="base.group_website_publisher">
                         <a data-action="translate" href="#">TRANSLATE</a>