diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 64f2de6e444..289ed4e19f3 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -1874,6 +1874,14 @@ const Wysiwyg = Widget.extend({
         // Some icons are relevant for icons, that aren't for other media.
         this.toolbar.$el.find('#colorInputButtonGroup, #create-link').toggleClass('d-none', isInMedia && !$target.is('.fa'));
         this.toolbar.$el.find('.only_fa').toggleClass('d-none', !$target.is('.fa'));
+        // Hide unsuitable buttons for icon 
+        if ($target.is('.fa')) {
+            this.toolbar.$el.find([
+                '#image-shape',
+                '#image-width',
+                '#image-edit',
+            ].join(',')).toggleClass('d-none', true);
+        }
         // Hide the create-link button if the selection spans several blocks.
         selection = this.odooEditor.document.getSelection();
         const range = selection && selection.rangeCount && selection.getRangeAt(0);
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 4acbf241c7d..c877510ccd8 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -211,7 +211,7 @@
             </div>
 
             <div class="btn-group only_fa">
-                <div id="fa-spin" title="Toggle icon spin" class="editor-ignore btn fa fa-refresh"></div>
+                <div id="fa-spin" title="Toggle icon spin" class="editor-ignore btn fa fa-play"></div>
             </div>
         </div>
     </t>