diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_automatedLatestContent.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_automatedLatestContent.scss
index 3dd9cc4bed..2e95266f73 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_automatedLatestContent.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_automatedLatestContent.scss
@@ -25,7 +25,8 @@
   }
 
   .mailpoet_container_block {
-    margin-bottom: 0;
+    padding-bottom: 0;
+    padding-top: 0;
   }
 }
 
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_base.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_base.scss
index 8f889d1508..6d914e0986 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_base.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_base.scss
@@ -5,11 +5,7 @@ $block-text-line-height: $text-line-height;
   box-sizing: border-box;
   box-sizing: border-box;
   float: left;
-
-  margin-bottom: 20px;
-
-  padding-left: 20px;
-  padding-right: 20px;
+  padding: 10px 20px;
   position: relative;
 
   & > .mailpoet_block_highlight {
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_container.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_container.scss
index 516965d549..7dbe513ed0 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_container.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_container.scss
@@ -41,11 +41,13 @@ $two-column-wider-column-width: (($newsletter-width / 3) - $column-margin) * 2;
   }
 
   & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block {
-    margin-bottom: 0;
+    padding-bottom: 0;
+    padding-top: 0;
   }
 
   .mailpoet_container_horizontal > .mailpoet_container_block {
-    margin-bottom: 0;
+    padding-bottom: 0;
+    padding-top: 0;
     width: $column-margin + $one-column-width + $column-margin;
   }
   & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal,
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_divider.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_divider.scss
index db103cbccf..96e3c3e9dd 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_divider.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_divider.scss
@@ -4,9 +4,7 @@ $divider-hover-border-color: $primary-active-color;
 
 .mailpoet_divider_block {
   cursor: all-scroll;
-  margin-bottom: 0;
-  padding-left: 0;
-  padding-right: 0;
+  padding: 0;
 }
 
 .mailpoet_divider {
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_footer.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_footer.scss
index 713ff9bee4..af3754c726 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_footer.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_footer.scss
@@ -1,7 +1,5 @@
 .mailpoet_footer_block {
-  margin-bottom: 0;
-  padding-left: 0;
-  padding-right: 0;
+  padding: 0;
 
   .mailpoet_content {
     padding: 10px 20px;
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_header.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_header.scss
index 4ec36a1718..b8194d8b42 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_header.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_header.scss
@@ -1,7 +1,5 @@
 .mailpoet_header_block {
-  margin-bottom: 0;
-  padding-left: 0;
-  padding-right: 0;
+  padding: 0;
 
   .mailpoet_content {
     padding: 10px 20px;
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_image.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_image.scss
index dbbc3b4b16..556a29284a 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_image.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_image.scss
@@ -8,9 +8,7 @@
 
   &.mailpoet_full_image {
     margin: auto;
-    margin-bottom: 0;
-    padding-left: 0;
-    padding-right: 0;
+    padding: 0;
   }
 
   .mailpoet_content  {
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_social.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_social.scss
index e3a2276153..42377ca16c 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_social.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_social.scss
@@ -1,5 +1,3 @@
-$social-block-vertical-padding: 0px;
-
 $social-icon-width: 32px;
 $active-social-icon-set-border-color: #adadad;
 $active-social-icon-set-background-color: #daebf2;
@@ -12,9 +10,6 @@ $tool-active-color: #d2d2d4;
 $tool-width: 16px;
 
 .mailpoet_social_block {
-  padding-bottom: $social-block-vertical-padding;
-  padding-top: $social-block-vertical-padding;
-
   .mailpoet_social {
     text-align: center;
   }
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_spacer.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_spacer.scss
index 6b4aef4a70..1ec6ad874a 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_spacer.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_spacer.scss
@@ -4,7 +4,5 @@
 
 .mailpoet_spacer_block {
   cursor: all-scroll;
-  margin-bottom: 0;
-  padding-left: 0;
-  padding-right: 0;
+  padding: 0;
 }
diff --git a/assets/css/src/components/newsletterEditor/contentBlocks/_text.scss b/assets/css/src/components/newsletterEditor/contentBlocks/_text.scss
index 68c2c13492..297a5a1ba3 100644
--- a/assets/css/src/components/newsletterEditor/contentBlocks/_text.scss
+++ b/assets/css/src/components/newsletterEditor/contentBlocks/_text.scss
@@ -4,10 +4,7 @@
 
   & > .mailpoet_content {
     overflow: hidden;
-    padding-bottom: 0px;
-    padding-left: 20px;
-    padding-right: 20px;
-    padding-top: 0;
+    padding: 0 20px;
 
     & > *:last-child {
       margin-bottom: 0;