diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 754a23601ac..75a7aede641 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -343,3 +343,6 @@
 .openerp2 .oe_form_label_help[for], .openerp2 .oe_form_label[for] {
   white-space: nowrap;
 }
+.openerp2 .oe_form_group_cell .oe_form_button {
+  width: 100%;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b67af4c14aa..e406f4bce73 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -336,6 +336,9 @@ $colour4: #8a89ba
         padding: 0 4px 0 4px
     .oe_form_label_help[for], .oe_form_label[for]
         white-space: nowrap
+    .oe_form_group_cell
+        .oe_form_button
+            width: 100%
     // }}}
 
     .openerp
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 4d847124edd..f12079765f9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1203,12 +1203,10 @@
     </t>
 </t>
 <t t-name="WidgetButton">
-    <div t-attf-class="oe_form_field_#{widget.type}">
-        <button type="button" class="oe_button">
-            <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
-            <span t-if="widget.string"><t t-esc="widget.string"/></span>
-        </button>
-    </div>
+    <button type="button" class="oe_button oe_form_button">
+        <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
+        <span t-if="widget.string"><t t-esc="widget.string"/></span>
+    </button>
 </t>
 <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">