diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b688b0d2b89..62391547040 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -34,7 +34,7 @@
   background: white;
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp a {
   text-decoration: none;
@@ -2097,27 +2097,27 @@
   padding-left: 8px;
 }
 .openerp .oe_form .oe_form_subtotal_footer {
+  width: auto;
   float: right;
 }
-.openerp .oe_form .oe_form_subtotal_footer > div {
+.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell {
   text-align: right;
-  padding: 3px;
+  padding: 0;
 }
-.openerp .oe_form .oe_form_subtotal_footer label {
-  font-weight: normal !important;
+.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label {
+  border: none;
 }
-.openerp .oe_form .oe_form_subtotal_footer span {
-  display: inline-block;
-  min-width: 80px;
-  text-align: right;
+.openerp .oe_form .oe_form_subtotal_footer .oe_form_field {
+  width: auto !important;
 }
 .openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator {
   border-top: 1px solid #cacaca;
   font-size: 120%;
   font-weight: bold;
 }
-.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator label {
+.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator {
   font-weight: bold !important;
+  padding: 2px 8px 2px 0px !important;
 }
 .openerp .oe-listview-content {
   width: 100%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0c8f4253549..18026b60070 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1715,22 +1715,22 @@ $colour4: #8a89ba
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 8px
         .oe_form_subtotal_footer
+            width: auto
             float: right
-            > div
-                text-align: right
-                padding: 3px
-            label
-                font-weight: normal !important
-            span
-                display: inline-block
-                min-width: 80px
+            td.oe_form_group_cell
                 text-align: right
+                padding: 0
+            td.oe_form_group_cell_label
+                border: none
+            .oe_form_field
+                width: auto !important
             .oe_form_subtotal_footer_separator
                 border-top: 1px solid #cacaca
                 font-size: 120%
                 font-weight: bold
-                label
-                    font-weight: bold !important
+            label.oe_form_subtotal_footer_separator
+                font-weight: bold !important
+                padding: 2px 8px 2px 0px !important
     // }}}
     // ListView {{{
     .oe-listview-content