diff --git a/CHANGELOG b/CHANGELOG
index 68008f7854..9c0f1b33d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Manage icons in input
 * Support RTL language direction
 * Apply factor on domain parser
 * Use tab name in CSV Export/Import
diff --git a/src/input-icon.less b/src/input-icon.less
new file mode 100644
index 0000000000..575b656383
--- /dev/null
+++ b/src/input-icon.less
@@ -0,0 +1,97 @@
+/*
+ * Input icons
+ */
+@import "variables";
+
+.input-icon {
+    position: relative;
+
+    & .icon-input {
+        position: absolute;
+        top: 0;
+        z-index: 4; // Ensure icon is above input
+        display: block;
+        width: @input-height-base;
+        height: @input-height-base;
+        line-height: @input-height-base;
+        text-align: center;
+    }
+    [dir="ltr"] & .icon-primary {
+        left: 0px;
+    }
+    [dir="rtl"] & .icon-primary {
+        right: 0px;
+    }
+    [dir="ltr"] & .icon-secondary {
+        right: 0px;
+    }
+    [dir="rtl"] & .icon-secondary {
+        left: 0px;
+    }
+}
+.input-lg .icon-input,
+.input-group-lg .icon-input {
+  width: @input-height-large;
+  height: @input-height-large;
+  line-height: @input-height-large;
+}
+.input-sm .icon-input,
+.input-group-sm .icon-input {
+  width: @input-height-small;
+  height: @input-height-small;
+  line-height: @input-height-small;
+}
+
+[dir="ltr"] {
+    .input-icon-primary > .form-control {
+        padding-left: @input-height-base;
+    }
+    .input-lg.input-icon-primary > .form-control,
+    .input-group-lg.input-icon-primary > .form-control {
+        padding-left: @input-height-large;
+    }
+    .input-sm.input-icon-primary > .form-control,
+    .input-group-sm.input-icon-primary > .form-control {
+        padding-left: @input-height-small;
+    }
+}
+[dir="rtl"] {
+    .input-icon-primary > .form-control {
+        padding-right: @input-height-base;
+    }
+    .input-lg.input-icon-primary > .form-control,
+    .input-group-lg.input-icon-primary > .form-control {
+        padding-right: @input-height-large;
+    }
+    .input-sm.input-icon-primary > .form-control,
+    .input-group-sm.input-icon-primary > .form-control {
+        padding-right: @input-height-small;
+    }
+}
+
+[dir="ltr"] {
+    .input-icon-secondary > .form-control {
+        padding-right: @input-height-base;
+    }
+    .input-lg.input-icon-secondary > .form-control,
+    .input-group-lg.input-icon-secondary > .form-control {
+        padding-right: @input-height-large;
+    }
+    .input-sm.input-icon-secondary > .form-control,
+    .input-group-sm.input-icon-secondary > .form-control {
+        padding-right: @input-height-small;
+    }
+}
+[dir="rtl"] {
+    .input-icon-secondary > .form-control {
+        padding-left: @input-height-base;
+    }
+    .input-lg.input-icon-secondary > .form-control,
+    .input-group-lg.input-icon-secondary > .form-control {
+        padding-left: @input-height-large;
+    }
+    .input-sm.input-icon-secondary > .form-control,
+    .input-group-sm.input-icon-secondary > .form-control {
+        padding-left: @input-height-small;
+    }
+}
diff --git a/src/view/form.js b/src/view/form.js
index 5d12f19ece..08b37ad4a9 100644
--- a/src/view/form.js
+++ b/src/view/form.js
@@ -1353,15 +1353,14 @@ function eval_pyson(value){
                 this.group.css('width', '100%');
             }
             if (this.attributes.translate) {
-                var button = jQuery('<button/>', {
-                    'class': 'btn btn-default btn-sm form-control',
-                    'type': 'button',
-                    'aria-label': Sao.i18n.gettext('Translate')
-                }).append(Sao.common.ICONFACTORY.get_icon_img('tryton-translate')
-                ).appendTo(jQuery('<span/>', {
-                    'class': 'input-group-btn'
-                }).appendTo(this.group));
-                button.click(this.translate.bind(this));
+                Sao.common.ICONFACTORY.get_icon_img('tryton-translate')
+                    .appendTo(jQuery('<div/>', {
+                        'class': 'icon-input icon-secondary',
+                        'aria-label': Sao.i18n.gettext('Translate'),
+                        'title': Sao.i18n.gettext('Translate'),
+                    }).appendTo(
+                        this.group.addClass('input-icon input-icon-secondary')))
+                .click(this.translate.bind(this));
             }
         },
         get_client_value: function(record, field) {
@@ -1469,18 +1468,15 @@ function eval_pyson(value){
                 'class': this.class_
             });
             this.date = this.labelled = jQuery('<div/>', {
-                'class': 'input-group input-group-sm'
+                'class': ('input-group input-group-sm ' +
+                    'input-icon input-icon-primary'),
             }).appendTo(this.el);
-            jQuery('<span/>', {
-                'class': 'input-group-btn'
-            }).append(jQuery('<button/>', {
-                'class': 'datepickerbutton btn btn-default',
-                'type': 'button',
-                'tabindex': -1,
-                'aria-label': Sao.i18n.gettext("Open the calendar"),
-                'title': Sao.i18n.gettext("Open the calendar"),
-            }).append(Sao.common.ICONFACTORY.get_icon_img('tryton-date')
-            )).appendTo(this.date);
+            Sao.common.ICONFACTORY.get_icon_img('tryton-date')
+                .appendTo(jQuery('<div/>', {
+                    'class': 'datepickerbutton icon-input icon-primary',
+                    'aria-label': Sao.i18n.gettext("Open the calendar"),
+                    'title': Sao.i18n.gettext("Open the calendar"),
+                }).appendTo(this.date));
             this.input = jQuery('<input/>', {
                 'type': 'text',
                 'class': 'form-control input-sm mousetrap'
@@ -2147,12 +2143,25 @@ function eval_pyson(value){
                 'class': this.class_
             });
             var group = jQuery('<div/>', {
-                'class': 'input-group input-group-sm'
+                'class': 'input-group input-group-sm input-icon'
             }).appendTo(this.el);
             this.entry = this.labelled = jQuery('<input/>', {
                 'type': 'input',
                 'class': 'form-control input-sm mousetrap'
             }).appendTo(group);
+            this.but_primary = jQuery('<img/>', {
+                'class': 'icon',
+            }).appendTo(jQuery('<div/>', {
+                'class': 'icon-input icon-primary',
+            }).appendTo(group));
+            this.but_secondary = jQuery('<img/>', {
+                'class': 'icon',
+            }).appendTo(jQuery('<div/>', {
+                'class': 'icon-input icon-secondary',
+            }).appendTo(group));
+            this.but_primary.click('primary', this.edit.bind(this));
+            this.but_secondary.click('secondary', this.edit.bind(this));
+
             // Use keydown to not receive focus-in TAB
             this.entry.on('keydown', this.key_press.bind(this));
 
@@ -2163,29 +2172,6 @@ function eval_pyson(value){
                     this._completion_action_activated.bind(this));
                 this.wid_completion = true;
             }
-
-            // Append buttons after the completion to not break layout
-            this.but_primary = jQuery('<button/>', {
-                'class': 'btn btn-default',
-                'type': 'button',
-                'tabindex': -1,
-            }).append(jQuery('<img/>', {
-                'class': 'icon'
-            })).appendTo(jQuery('<span/>', {
-                'class': 'input-group-btn'
-            }).prependTo(group));
-            this.but_secondary = jQuery('<button/>', {
-                'class': 'btn btn-default',
-                'type': 'button',
-                'tabindex': -1,
-            }).append(jQuery('<img/>', {
-                'class': 'icon'
-            })).appendTo(jQuery('<span/>', {
-                'class': 'input-group-btn'
-            }).appendTo(group));
-            this.but_primary.click('primary', this.edit.bind(this));
-            this.but_secondary.click('secondary', this.edit.bind(this));
-
             this.el.change(this.focus_out.bind(this));
             this._readonly = false;
         },
@@ -2268,21 +2254,24 @@ function eval_pyson(value){
                 secondary = null;
             }
             [
-                [primary, tooltip1, this.but_primary],
-                [secondary, tooltip2, this.but_secondary]
+                [primary, tooltip1, this.but_primary, 'primary'],
+                [secondary, tooltip2, this.but_secondary, 'secondary']
             ].forEach(function(items) {
                 var icon_name = items[0];
                 var tooltip = items[1];
                 var button = items[2];
-                var img = button.find('img');
+                var icon_input = button.parent();
+                var type = 'input-icon-' + items[3];
                 // don't use .hide/.show because the display value is not
                 // correctly restored on modal.
                 if (!icon_name) {
-                    button.parent().css('display', 'none');
+                    icon_input.hide();
+                    icon_input.parent().removeClass(type);
                 } else {
-                    button.parent().css('display', 'table-cell');
+                    icon_input.show();
+                    icon_input.parent().addClass(type);
                     Sao.common.ICONFACTORY.get_icon_url(icon_name).then(function(url) {
-                        img.attr('src', url);
+                        button.attr('src', url);
                     });
                 }
                 button.attr('aria-label', tooltip);
@@ -4411,16 +4400,12 @@ function eval_pyson(value){
         create_widget: function() {
             Sao.View.Form.Dict.Date._super.create_widget.call(this);
             this.date = this.input.parent();
-            jQuery('<span/>', {
-                'class': 'input-group-btn',
-            }).append(jQuery('<button/>', {
-                'class': 'datepickerbutton btn btn-default',
-                'type': 'button',
-                'tabindex': -1,
-                'aria-label': Sao.i18n.gettext("Open the calendar"),
-                'title': Sao.i18n.gettext("Open the calendar"),
-            }).append(Sao.common.ICONFACTORY.get_icon_img('tryton-date')
-            )).prependTo(this.date);
+            Sao.common.ICONFACTORY.get_icon_img('tryton-date')
+                .appendTo(jQuery('<div/>', {
+                    'class': 'datepickerbutton icon-input icon-primary',
+                    'aria-label': Sao.i18n.gettext("Open the calendar"),
+                    'title': Sao.i18n.gettext("Open the calendar"),
+                }).prependTo(this.date));
             this.date.datetimepicker({
                 'format': Sao.common.moment_format(this.format),
                 'locale': moment.locale(),
@@ -4486,10 +4471,9 @@ function eval_pyson(value){
             this.decoder = new Sao.PYSON.Decoder({}, true);
             this.el.keyup(this.validate_pyson.bind(this));
             this.icon = jQuery('<img/>', {
-                'class': 'icon',
-            }).appendTo(jQuery('<span/>', {
-                'class': 'input-group-addon',
-            }).appendTo(this.group));
+                'class': 'icon form-control-feedback',
+            }).appendTo(this.group);
+            this.group.addClass('has-feedback');
         },
         display: function(record, field) {
             Sao.View.Form.PYSON._super.display.call(this, record, field);
@@ -4530,7 +4514,7 @@ function eval_pyson(value){
             if (this.get_encoded_value() === null) {
                 icon = 'error';
             }
-            Sao.common.ICONFACTORY.get_icon_img('tryton-' + icon)
+            Sao.common.ICONFACTORY.get_icon_url('tryton-' + icon)
                 .then(function(url) {
                     this.icon.attr('src', url);
                 }.bind(this));