diff --git a/assets/css/src/newsletter_editor/contentBlocks/container.styl b/assets/css/src/newsletter_editor/contentBlocks/container.styl
index 47117ab5ed..bf75d74c22 100644
--- a/assets/css/src/newsletter_editor/contentBlocks/container.styl
+++ b/assets/css/src/newsletter_editor/contentBlocks/container.styl
@@ -1,3 +1,8 @@
+$column-margin = 20px
+$one-column-width = $newsletter-width - (2 * $column-margin)
+$two-column-width = ($newsletter-width / 2) - (2 * $column-margin)
+$three-column-width = ($newsletter-width / 3) - (2 * $column-margin)
+
 .mailpoet_container
   width: 100%
   min-height: 15px
@@ -44,7 +49,7 @@
 
   .mailpoet_container_horizontal > .mailpoet_container_block
     margin-bottom: 0
-    width: 20px + 560px + 20px
+    width: $column-margin + $one-column-width + $column-margin
 
   // More than one column
   & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal
@@ -57,14 +62,14 @@
     & > .mailpoet_block:first-child:nth-last-child(2) ~ .mailpoet_block
       //padding-left: 20px
       //padding-right: 20px
-      width: 260px + 20px + 20px
+      width: $column-margin + $two-column-width + $column-margin
 
     // Three columns
     & > .mailpoet_block:first-child:nth-last-child(3)
     & > .mailpoet_block:first-child:nth-last-child(3) ~ .mailpoet_block
       //padding-left: 20px
       //padding-right: 20px
-      width: 160px + 20px + 20px
+      width: $column-margin + $three-column-width + $column-margin
 
 .mailpoet_container_empty
   text-align: center
diff --git a/assets/css/src/newsletter_editor/variables.styl b/assets/css/src/newsletter_editor/variables.styl
index 09210b01dc..73beff2aeb 100644
--- a/assets/css/src/newsletter_editor/variables.styl
+++ b/assets/css/src/newsletter_editor/variables.styl
@@ -23,4 +23,4 @@ $warning-alternate-text-color = #f4c6c8
 $error-text-color = #d54e21
 
 // Dimensions
-$newsletter-width = 600px
+$newsletter-width = 660px
diff --git a/assets/js/src/newsletter_editor/blocks/image.js b/assets/js/src/newsletter_editor/blocks/image.js
index 22b3ffadd1..b7272f75bd 100644
--- a/assets/js/src/newsletter_editor/blocks/image.js
+++ b/assets/js/src/newsletter_editor/blocks/image.js
@@ -297,9 +297,9 @@ define([
             // Following advice from Becs, the target width should
             // be a double of one column width to render well on
             // retina screen devices
-            targetImageWidth = 1200,
+            targetImageWidth = 1320,
 
-            // For main image use the size, that's closest to being 600px in width
+            // For main image use the size, that's closest to being 660px in width
             sizeKeys = _.keys(sizes),
 
             // Pick the width that is closest to target width