diff --git a/addons/portal/static/src/less/portal.less b/addons/portal/static/src/less/portal.less
index 2dc8fa83c84..e6344b3d5d9 100644
--- a/addons/portal/static/src/less/portal.less
+++ b/addons/portal/static/src/less/portal.less
@@ -152,6 +152,10 @@ img, .media_iframe_video, .o_image {
         margin-right: @grid-gutter-width / 2;
     }
 }
+img {
+    // Make all images responsive by default but with inline-block display
+    .img-responsive(inline-block);
+}
 
 // Others
 ::-moz-selection {
diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index bb8f5d9cfb7..6791a21f721 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -286,7 +286,7 @@ var ImageWidget = MediaWidget.extend({
         var img = this.images[0];
         if (!img.isDocument) {
             if (!this.$media.is('img')) {
-                this._replaceMedia($('<img/>', {class: 'img img-responsive'}));
+                this._replaceMedia($('<img/>'));
             }
             this.$media.attr('src', img.src);
         } else {
@@ -409,7 +409,7 @@ var ImageWidget = MediaWidget.extend({
             var $div = $(el);
             if (/gif|jpe|jpg|png/.test($div.data('mimetype'))) {
                 var $img = $('<img/>', {
-                    class: 'img img-responsive',
+                    class: 'img-responsive',
                     src: $div.data('url') || $div.data('src'),
                 });
                 var def = $.Deferred();