diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index c0d50a27334..cfca69d5f88 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -129,6 +129,9 @@
 
     dom_ready.then(function () {
 
+        /* ----- BOOTSTRAP  STUFF ---- */
+        $('.js_tooltip').bstooltip();
+
         /* ----- PUBLISHING STUFF ---- */
         $('[data-publish]:has(.js_publish)').each(function () {
             var $pub = $("[data-publish]", this);
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 5e546aa3baa..65d08ca0d38 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -81,6 +81,11 @@
                             <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
                             <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
                             <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
+                            <script type="text/javascript">
+                                // Bootstrap and jQuery UI conflicts
+                                $.fn.bstooltip = $.fn.tooltip;
+                                $.fn.bsbutton = $.fn.button;
+                            </script>
                             <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
                             <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
                             <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
@@ -138,8 +143,9 @@
                                                     </ul>
                                                 </li>
                                             </ul>
-                                            <button t-if="editable" type="button" class="js_edit_menu btn btn-primary mt8 pull-right">
-                                                <i class="icon-reorder"/> Edit Menu
+                                            <button t-if="editable" type="button" title="Edit menu" data-placement="left"
+                                                    class="js_edit_menu js_tooltip oe_admin_action btn btn-warning mt8 pull-right">
+                                                <i class="icon-edit"/>
                                             </button>
                                         </div>
                                     </div>