diff --git a/lib/Config/PopulatorData/Templates/BookStoreWithCoupon.php b/lib/Config/PopulatorData/Templates/BookStoreWithCoupon.php
index b3e9eb4254..43cab0c770 100644
--- a/lib/Config/PopulatorData/Templates/BookStoreWithCoupon.php
+++ b/lib/Config/PopulatorData/Templates/BookStoreWithCoupon.php
@@ -595,7 +595,7 @@ class BookStoreWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -634,7 +634,7 @@ class BookStoreWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -673,7 +673,7 @@ class BookStoreWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
diff --git a/lib/Config/PopulatorData/Templates/ClearNews.php b/lib/Config/PopulatorData/Templates/ClearNews.php
index ffdfed5bbc..373420a17e 100644
--- a/lib/Config/PopulatorData/Templates/ClearNews.php
+++ b/lib/Config/PopulatorData/Templates/ClearNews.php
@@ -1459,7 +1459,7 @@ class ClearNews {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/03-circles/Facebook.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url.'/03-circles/Facebook.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -1469,7 +1469,7 @@ class ClearNews {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/03-circles/Twitter.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url.'/03-circles/Twitter.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -1479,7 +1479,7 @@ class ClearNews {
                         'type' => 'socialIcon',
                         'iconType' => 'youtube',
                         'link' => 'http://www.youtube.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/03-circles/Youtube.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url.'/03-circles/Youtube.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Youtube',
diff --git a/lib/Config/PopulatorData/Templates/FashionBlogA.php b/lib/Config/PopulatorData/Templates/FashionBlogA.php
index 71e9e652f3..e0c2017dc1 100644
--- a/lib/Config/PopulatorData/Templates/FashionBlogA.php
+++ b/lib/Config/PopulatorData/Templates/FashionBlogA.php
@@ -968,7 +968,7 @@ class FashionBlogA {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -978,7 +978,7 @@ class FashionBlogA {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -988,7 +988,7 @@ class FashionBlogA {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
diff --git a/lib/Config/PopulatorData/Templates/FashionShop.php b/lib/Config/PopulatorData/Templates/FashionShop.php
index 351d6a7a6e..93aac79ca9 100644
--- a/lib/Config/PopulatorData/Templates/FashionShop.php
+++ b/lib/Config/PopulatorData/Templates/FashionShop.php
@@ -552,7 +552,7 @@ class FashionShop {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/06-full-symbol-color/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/06-full-symbol-color/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -562,7 +562,7 @@ class FashionShop {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/06-full-symbol-color/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/06-full-symbol-color/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -572,7 +572,7 @@ class FashionShop {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/06-full-symbol-color/Instagram.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/06-full-symbol-color/Instagram.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
@@ -582,7 +582,7 @@ class FashionShop {
                         'type' => 'socialIcon',
                         'iconType' => 'youtube',
                         'link' => 'http://www.youtube.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/06-full-symbol-color/Youtube.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/06-full-symbol-color/Youtube.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Youtube',
diff --git a/lib/Config/PopulatorData/Templates/FlowersWithCoupon.php b/lib/Config/PopulatorData/Templates/FlowersWithCoupon.php
index fbd6ec7871..3cd5cd1355 100644
--- a/lib/Config/PopulatorData/Templates/FlowersWithCoupon.php
+++ b/lib/Config/PopulatorData/Templates/FlowersWithCoupon.php
@@ -224,7 +224,7 @@ class FlowersWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -234,7 +234,7 @@ class FlowersWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -244,7 +244,7 @@ class FlowersWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
@@ -1086,7 +1086,7 @@ class FlowersWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/02-grey/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/02-grey/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -1096,7 +1096,7 @@ class FlowersWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/02-grey/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/02-grey/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -1106,7 +1106,7 @@ class FlowersWithCoupon {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/02-grey/Instagram.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/02-grey/Instagram.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
diff --git a/lib/Config/PopulatorData/Templates/IndustryConference.php b/lib/Config/PopulatorData/Templates/IndustryConference.php
index 90a121e508..fab587b36e 100644
--- a/lib/Config/PopulatorData/Templates/IndustryConference.php
+++ b/lib/Config/PopulatorData/Templates/IndustryConference.php
@@ -997,7 +997,7 @@ class IndustryConference {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/08-full-symbol-grey/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/08-full-symbol-grey/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -1007,7 +1007,7 @@ class IndustryConference {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/08-full-symbol-grey/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/08-full-symbol-grey/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -1017,7 +1017,7 @@ class IndustryConference {
                         'type' => 'socialIcon',
                         'iconType' => 'email',
                         'link' => '',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/08-full-symbol-grey/Email.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/08-full-symbol-grey/Email.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Email',
@@ -1027,7 +1027,7 @@ class IndustryConference {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/08-full-symbol-grey/Instagram.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/08-full-symbol-grey/Instagram.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
diff --git a/lib/Config/PopulatorData/Templates/LifestyleBlogA.php b/lib/Config/PopulatorData/Templates/LifestyleBlogA.php
index cafbbfa5be..4befd00abc 100644
--- a/lib/Config/PopulatorData/Templates/LifestyleBlogA.php
+++ b/lib/Config/PopulatorData/Templates/LifestyleBlogA.php
@@ -856,7 +856,7 @@ class LifestyleBlogA {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -866,7 +866,7 @@ class LifestyleBlogA {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -876,7 +876,7 @@ class LifestyleBlogA {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Instagram.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
diff --git a/lib/Config/PopulatorData/Templates/LifestyleBlogB.php b/lib/Config/PopulatorData/Templates/LifestyleBlogB.php
index b8a5ff1c73..5be3a2e08f 100644
--- a/lib/Config/PopulatorData/Templates/LifestyleBlogB.php
+++ b/lib/Config/PopulatorData/Templates/LifestyleBlogB.php
@@ -1065,7 +1065,7 @@ class LifestyleBlogB {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/03-circles/Facebook.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/03-circles/Facebook.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -1075,7 +1075,7 @@ class LifestyleBlogB {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/03-circles/Twitter.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/03-circles/Twitter.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -1085,7 +1085,7 @@ class LifestyleBlogB {
                         'type' => 'socialIcon',
                         'iconType' => 'website',
                         'link' => '',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/03-circles/Website.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/03-circles/Website.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Website',
@@ -1095,7 +1095,7 @@ class LifestyleBlogB {
                         'type' => 'socialIcon',
                         'iconType' => 'pinterest',
                         'link' => 'http://www.pinterest.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/03-circles/Pinterest.png?mailpoet_version=3.16.3',
+                        'image' => $this->social_icon_url.'/03-circles/Pinterest.png?mailpoet_version=3.16.3',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Pinterest',
diff --git a/lib/Config/PopulatorData/Templates/NewspaperTraditional.php b/lib/Config/PopulatorData/Templates/NewspaperTraditional.php
index 4cc2f9fbc4..131cb3b7e4 100644
--- a/lib/Config/PopulatorData/Templates/NewspaperTraditional.php
+++ b/lib/Config/PopulatorData/Templates/NewspaperTraditional.php
@@ -250,7 +250,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://mailpoet.info/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Facebook.png?mailpoet_version=3.12.1',
+                        'image' => $this->social_icon_url . '/07-full-symbol-black/Facebook.png?mailpoet_version=3.12.1',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -260,7 +260,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://mailpoet.info/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Twitter.png?mailpoet_version=3.12.1',
+                        'image' => $this->social_icon_url . '/07-full-symbol-black/Twitter.png?mailpoet_version=3.12.1',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -270,7 +270,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'website',
                         'link' => '',
-                        'image' => 'http://mailpoet.info/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Website.png?mailpoet_version=3.12.1',
+                        'image' => $this->social_icon_url . '/07-full-symbol-black/Website.png?mailpoet_version=3.12.1',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Website',
@@ -280,7 +280,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://mailpoet.info/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Instagram.png?mailpoet_version=3.12.1',
+                        'image' => $this->social_icon_url . '/07-full-symbol-black/Instagram.png?mailpoet_version=3.12.1',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
@@ -749,7 +749,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Facebook.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Facebook.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -759,7 +759,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Twitter.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Twitter.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -769,7 +769,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Instagram.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Instagram.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
@@ -779,7 +779,7 @@ class NewspaperTraditional {
                         'type' => 'socialIcon',
                         'iconType' => 'email',
                         'link' => '',
-                        'image' => 'http://1and101.apps-1and1.net/wp-content/plugins/mailpoet/assets/img/newsletter_editor/social-icons/07-full-symbol-black/Email.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url.'/07-full-symbol-black/Email.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Email',
diff --git a/plugin_repository/assets/newsletter-templates/clear-news/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/clear-news/thumbnail.jpg
index 76569c9013..e332e9bf8b 100644
Binary files a/plugin_repository/assets/newsletter-templates/clear-news/thumbnail.jpg and b/plugin_repository/assets/newsletter-templates/clear-news/thumbnail.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/industry-conference/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/industry-conference/thumbnail.jpg
index 72050e0206..ac2b5aab04 100644
Binary files a/plugin_repository/assets/newsletter-templates/industry-conference/thumbnail.jpg and b/plugin_repository/assets/newsletter-templates/industry-conference/thumbnail.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/newspaper-traditional/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/newspaper-traditional/thumbnail.jpg
index 1a2931910c..3263fbb686 100644
Binary files a/plugin_repository/assets/newsletter-templates/newspaper-traditional/thumbnail.jpg and b/plugin_repository/assets/newsletter-templates/newspaper-traditional/thumbnail.jpg differ