diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index a9dabb25dee..236be4ad68f 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -402,8 +402,9 @@
                             }
                         });
                         // Adding Static Menus
-                        menu.append('<li class="divider"></li><li class="js_change_theme"><a href="/page/website.themes">Change Theme</a></li>');
-                        menu.append('<li><a data-action="ace" href="#">HTML Editor</a></li>');
+                        menu.append('<li class="divider"></li>');
+			menu.append('<li><a data-action="ace" href="#">HTML Editor</a></li>');
+                        menu.append('<li class="js_change_theme"><a href="/page/website.themes">Change Theme</a></li>');
                         self.trigger('rte:customize_menu_ready');
                     }
                 );
diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index da99b76f279..e25de37b524 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -780,7 +780,7 @@
         *  This method is called when the user click inside the snippet in the dom
         */
         onFocus : function () {
-            this.$overlay.addClass('oe_active').effect('bounce', {distance: 18, times: 5}, 250);
+            this.$overlay.addClass('oe_active');
         },
 
         /* onFocus
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 1750fb1e7a6..d9445e05d4d 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -45,9 +45,6 @@
                         </div>
                         <group>
                             <group string="Social Icons">
-                                <p class="oe_grey" colspan="2">
-                                    Keep these fields empty to not show the related social icon.
-                                </p>
                                 <field name="social_twitter" placeholder="https://twitter.com/openerp"/>
                                 <field name="social_facebook" placeholder="https://facebook.com/openerp"/>
                                 <field name="social_googleplus" placeholder="https://plus.google.com/+openerp"/>