diff --git a/addons/website/static/lib/summernote/src/less/summernote.less b/addons/website/static/lib/summernote/src/less/summernote.less
index 4a16ba4b273..c9c538e940d 100644
--- a/addons/website/static/lib/summernote/src/less/summernote.less
+++ b/addons/website/static/lib/summernote/src/less/summernote.less
@@ -1,4 +1,4 @@
-@import "elements.less";
+/* @_import "elements.less"; */
 
 /* Theme Variables
  ------------------------------------------*/
diff --git a/addons/website/static/src/js/summernote.js b/addons/website/static/src/js/summernote.js
index 282a06623aa..70678e58014 100644
--- a/addons/website/static/src/js/summernote.js
+++ b/addons/website/static/src/js/summernote.js
@@ -1779,7 +1779,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
         var startPoint = rng.getStartPoint();
         var endPoint = rng.getEndPoint();
 
-        if (rng.isCollapsed()) {
+        if (rng.isCollapsed() && !dom.isFont(rng.sc)) {
             return {
                 sc: startPoint.node,
                 so: startPoint.offset,
@@ -1827,6 +1827,11 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
         });
         nodes = list.unique(nodes);
 
+        // If ico fa
+        if (rng.isCollapsed()) {
+            node.push(startPoint.node);
+        }
+
         // apply font: foreColor, backColor, size (the color can be use a class text-... or bg-...)
         var node, font, $font, fonts = [], className;
         if (color || bgcolor || size) {
@@ -1850,7 +1855,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
 
             if (color) {
               for (var k=0; k<className.length; k++) {
-                if (!className[k].length && className[k].slice(0,5) === "text-") {
+                if (className[k].length && className[k].slice(0,5) === "text-") {
                   className.splice(k,1);
                   k--;
                 }
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index e0b042be1aa..17b9eb909cf 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -111,8 +111,6 @@ define(['summernote/summernote'], function () {
             })).appendTo($resizefa);
         }
         var $colorfa = $airPopover.find('.note-color').clone();
-        $colorfa.find(".btn-group:first").remove();
-        $colorfa.find("ul.dropdown-menu").css('min-width', '172px');
         $colorfa.find('button[data-event="color"]').attr('data-value', '{"foreColor": "#f00"}')
             .find("i").css({'background': '', 'color': '#f00'});
         $resizefa.after($colorfa);
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 5f317ba401a..67dd1e7d0f1 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -59,9 +59,9 @@
     <script>openerp.define.next = 'summernote/openerp';</script>
     <script type="text/javascript" src="/website/static/src/js/summernote.js"></script>
     <script>openerp.define.desactive();</script>
-
-    <!--link rel="stylesheet" href="/website/static/lib/summernote/src/less/summernote.less"/-->
-    <link rel="stylesheet" href="/website/static/lib/summernote/summernote.css"/>
+    <link rel="stylesheet" href="/website/static/lib/summernote/src/less/elements.less"/>
+    <link rel="stylesheet" href="/website/static/lib/summernote/src/less/summernote.less"/>
+    <!--<link rel="stylesheet" href="/website/static/lib/summernote/summernote.css"/>-->
 </template>
 
 <template id="assets_common" inherit_id="web.assets_common" name="Website common assets">