diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ba6cb2b8c3e..aa2300b9298 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1020,6 +1020,7 @@ label.error {
 .openerp td.oe_form_frame_cell {
     padding: 2px;
     position: relative;
+    white-space: nowrap;
 }
 .openerp td.oe_form_field_boolean {
     padding-top: 4px;
@@ -1174,16 +1175,11 @@ label.error {
     vertical-align: top;
 }
 .openerp .oe_input_icon {
-    position: absolute;
     cursor: pointer;
-    right: 4px;
-    top: 5px;
-    z-index: 1;
+    margin: 3px 0 0 -21px;
+    vertical-align: top;
 }
 .openerp .oe_datepicker_container {
-    position: absolute;
-    top: 0;
-    right: 0;
     display: none;
 }
 .openerp .oe_datepicker_root {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8333b6c94a0..bab92f9711b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -863,8 +863,7 @@
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
         style="width: 100%"
-    />
-    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldChar.readonly">
     <div
@@ -909,18 +908,16 @@
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
         style="width: 100%"
-    ></textarea>
-    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root">
+        <input type="text" size="1" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text" size="1" style="width: 100%"
             t-att-name="widget.name"
             t-attf-class="oe_datepicker_master field_#{widget.type_of_date}"
-        />
-        <img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
+        /><img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
              title="Select date" width="16" height="16" border="0"/>
-        <input type="text" size="1" class="oe_datepicker_container" disabled="disabled"/>
     </div>
 </t>
 <t t-name="FieldSelection">