diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 36de51db096..eb4c5b2851c 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -216,7 +216,7 @@ ul.oe_menu_editor .disclose {
 
 .modal .font-icons-icons {
   font-size: 2em;
-  max-height: 6em;
+  max-height: 9em;
   overflow: auto;
 }
 .modal .font-icons-icons .font-icons-icon {
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 5d93edce80e..cbfca8be131 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -329,9 +329,10 @@
   margin-left: -50px;
 }
 .oe_overlay .oe_handle.size .oe_handle_button {
+  position: relative;
   z-index: 3;
   text-align: center;
-  margin-left: -32px;
+  margin-left: -52px;
   margin-top: -10px;
   left: 0px;
 }
@@ -343,15 +344,17 @@
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
 .oe_overlay .oe_handle.size .size {
+  position: absolute;
   width: 64px;
   cursor: row-resize;
   top: 9px;
+  margin-left: 52px;
+  padding: 0 5px;
 }
 .oe_overlay .oe_handle.size .auto_size {
+  position: absolute;
   width: 100px;
-  padding: 0 5px;
-  top: 1px;
-  margin-left: 36px;
+  top: 9px;
   cursor: pointer;
 }
 .oe_overlay .oe_handle.readonly {
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 3f57ca4464d..40467897e26 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -241,9 +241,10 @@
             bottom: -6px
             margin-left: -50px
             .oe_handle_button
+                position: relative
                 z-index: 3
                 text-align: center
-                margin-left: -32px
+                margin-left: -52px
                 margin-top: -10px
                 left: 0px
                 &:hover
@@ -251,14 +252,16 @@
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
             .size
+                position: absolute
                 width: 64px
                 cursor: row-resize
                 top: 9px
-            .auto_size
-                width: 100px
+                margin-left: 52px
                 padding: 0 5px
-                top: 1px
-                margin-left: 36px
+            .auto_size
+                position: absolute
+                width: 100px
+                top: 9px
                 cursor: pointer
         &.readonly
             cursor: auto !important
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index ea4ef3751fe..b1853f366b0 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -39,8 +39,8 @@
                 <div class='oe_handle e readonly'><div></div></div>
                 <div class='oe_handle w readonly'><div></div></div>
                 <div class='oe_handle size readonly'>
-                    <div class="oe_handle_button size">Resize</div>
                     <div class="oe_handle_button auto_size">Auto Resize</div>
+                    <div class="oe_handle_button size">Resize</div>
                 </div>
                 <div class='oe_handle s readonly'><div></div></div>
             </div>