diff --git a/addons/mass_mailing_themes/static/src/img/theme_airmail/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_airmail/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_airmail/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_bignews/bignews_logo.png
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_logo.png
rename to addons/mass_mailing_themes/static/src/img/theme_bignews/bignews_logo.png
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_cover.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_banner.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_cover.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_banner.jpg
deleted file mode 100644
index e99e8bb3955..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_event.jpg
deleted file mode 100644
index 7c8401854f9..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image.jpg
deleted file mode 100644
index 287abaff0c2..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image_text.jpg
deleted file mode 100644
index 3c3e283685a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_text_image.jpg
deleted file mode 100644
index 3c3e283685a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_1.jpg
deleted file mode 100644
index 9630851b97d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_2.jpg
deleted file mode 100644
index 9630851b97d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_3.jpg
deleted file mode 100644
index 9630851b97d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index 935de240199..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 935de240199..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_logo.png
deleted file mode 100644
index 218cb2715ad..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_logo.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_banner.jpg
deleted file mode 100644
index 2b45c74608d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_event.jpg
deleted file mode 100644
index eb323413191..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image.jpg
deleted file mode 100644
index 0bd60ae63b8..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_text_image.jpg
deleted file mode 100644
index 057dd61a22b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index 837b8c29afc..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 8c1314a2a69..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index 929b7a5bb9a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index fbabcb8bb3d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 794cbed85e2..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image_text.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_image_text_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_image_text_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_logo.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_logo.jpg
deleted file mode 100644
index 746f878d79f..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_logo.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_1.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_1.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_1.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner.jpg
deleted file mode 100644
index 8f837a55b19..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_event.jpg
deleted file mode 100644
index 0b11910b534..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image.jpg
deleted file mode 100644
index 09f4e2f5e8d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg
deleted file mode 100644
index cbee8e6dcc0..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg
deleted file mode 100644
index 32a2c86d1bd..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg
deleted file mode 100644
index 2d2c7a07cf5..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg
deleted file mode 100644
index 264ff911794..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg
deleted file mode 100644
index 6ce7085e354..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index a8b2283e08f..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 461f62d25f2..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png
index 024ed8c8862..c7d4f444b2d 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png and b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_1.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_1.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_1.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_3.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_3.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_3.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_banner.jpg
deleted file mode 100755
index e6a85a38b43..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_logo.png
deleted file mode 100755
index 1f5169a218f..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_logo.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/solar_coupon.png b/addons/mass_mailing_themes/static/src/img/theme_solar/solar_coupon.png
deleted file mode 100644
index c35eee4d9c9..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/solar_coupon.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_banner.jpg
deleted file mode 100755
index e6a85a38b43..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_1.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_1.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_1.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_3.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_3.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_3.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg
index 290c835ce6f..7ba2845d1a0 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg and b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_tech/tech_logo.png
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_logo.png
rename to addons/mass_mailing_themes/static/src/img/theme_tech/tech_logo.png
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_banner.jpg
deleted file mode 100755
index e6a85a38b43..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_vip/vip_logo.png
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_logo.png
rename to addons/mass_mailing_themes/static/src/img/theme_vip/vip_logo.png
diff --git a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
index 995dbc2fcdc..c1f4ace006a 100644
--- a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
+++ b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
@@ -73,7 +73,7 @@
                     <div class="col-lg-12 s_media_list_item pt0 pb0" data-name="Media item">
                         <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
                             <div class="col-lg-5 s_media_list_img_wrapper align-self-stretch px-0">
-                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_1.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
+                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_1.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
                             </div>
                             <div class="col-lg-7 s_media_list_body">
                                 <h3>Get 6-months' worth of knowledge
@@ -86,7 +86,7 @@
                     <div class="col-lg-12 s_media_list_item pt16 pb0" data-name="Media item">
                         <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
                             <div class="col-lg-5 s_media_list_img_wrapper align-self-stretch px-0">
-                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_2.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
+                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_2.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
                             </div>
                             <div class="col-lg-7 s_media_list_body">
                                 <h3>Meet (other) awesome members
@@ -99,7 +99,7 @@
                     <div class="col-lg-12 s_media_list_item pt16 pb0" data-name="Media item">
                         <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
                             <div class=" col-lg-5 s_media_list_img_wrapper align-self-stretch px-0">
-                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_3.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
+                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_3.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
                             </div>
                             <div class="col-lg-7 s_media_list_body">
                                 <h3>An interactive, fun
@@ -180,8 +180,8 @@
             <div class="container">
                 <div class="row">
                     <div class="col-lg-8">
-                        <a style="text-decoration:none;float:none;" href="#">
-                            <img width="189" style="height:auto;max-width:400px;" src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_logo.png"/>
+                        <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;float:none;" target="_blank">
+                            <img border="0" width="189" style="height:auto;max-width:400px;" src="/mass_mailing_themes/static/src/img/theme_tech/tech_logo.png"/>
                         </a>
                     </div>
                     <div class="col-lg-4 o_mail_header_social" style="text-align:right;">
@@ -218,7 +218,7 @@
                         <p style="text-align:left;"><a class="btn btn-primary rounded-circle" href="#">VISIT OUR WEBSITE</a></p>
                     </div>
                     <div class="col-lg-5 px-0">
-                        <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_tech/text_image-triangle.png" data-original-id="242" data-original-src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/triangle" data-file-name="text_image-triangle.svg" data-shape-colors=";;;;" data-original-mimetype="image/jpeg"/>
+                        <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-original-id="242" data-original-src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/triangle" data-file-name="text_image-triangle.svg" data-shape-colors=";;;;" data-original-mimetype="image/jpeg"/>
                     </div>
                 </div>
             </div>
@@ -232,7 +232,7 @@
                     <div class="col-lg-12 s_media_list_item pb0 pt0" data-name="Media item">
                         <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
                             <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
-                                <img src="/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_1.jpg" class="s_media_list_img h-100 w-100"/>
+                                <img src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_1.jpg" class="s_media_list_img h-100 w-100"/>
                             </div>
                             <div class="col-lg-8 s_media_list_body">
                                 <h3>The future of smartphone video production</h3>
@@ -255,7 +255,7 @@
                     <div class="col-lg-12 s_media_list_item pb0 pt0" data-name="Media item">
                         <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
                             <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
-                                <img src="/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_2.jpg" class="s_media_list_img h-100 w-100"/>
+                                <img src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_2.jpg" class="s_media_list_img h-100 w-100"/>
                             </div>
                             <div class="col-lg-8 s_media_list_body pt16 pb16">
                                 <h3>5 Ways Drones Can Better Your Live Events</h3>
@@ -276,7 +276,7 @@
                     <div class="col-lg-12 s_media_list_item pt0 pb0" data-name="Media item">
                         <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
                             <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
-                                <img src="/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_3.jpg" class="s_media_list_img h-100 w-100"/>
+                                <img src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_3.jpg" class="s_media_list_img h-100 w-100"/>
                             </div>
                             <div class="col-lg-8 s_media_list_body">
                                 <h3>How to Code a Website Without Experience</h3>
@@ -505,7 +505,7 @@
             <div class="container">
                 <div class="row align-items-center">
                     <div class="col-lg-8 px-0">
-                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image_text.jpg" class="img w-100" style="width: 533px;"/>
+                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text.jpg" class="img w-100" style="width: 533px;"/>
                     </div>
                     <div class="col-lg-4 o_cc pt0 pb0">
                         <h2 style="text-align: center;">IN THIS ISSUE</h2>
@@ -551,7 +551,7 @@
                     <div class="col-lg-6 o_cc">
                         <h3><font style="background-color: rgb(231, 148, 57);">TRAVEL</font></h3>
                         <a href="#">
-                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_2.jpg" alt="Man on a rock looking at mountains in the distance" style="width: 100% !important; padding: 15px 0px;"/>
+                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_2.jpg" alt="Man on a rock looking at mountains in the distance" style="width: 100% !important; padding: 15px 0px;"/>
                         </a>
                         <h2 style="text-align: left;">Destinations for an eco-holiday</h2>
                         <p style="text-align: left;">Bitten by the travel bug but looking to travel consciously? Eco-travel is the way forward.</p>
@@ -564,7 +564,7 @@
                     <div class="col-lg-6 o_cc">
                         <h3><font style="background-color: rgb(231, 99, 99);">LIFESTYLE</font></h3>
                         <a href="#">
-                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_1.jpg" alt="Woman having breakfast in bed" style="width: 100% !important; padding: 15px 0px;"/>
+                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_1.jpg" alt="Woman having breakfast in bed" style="width: 100% !important; padding: 15px 0px;"/>
                         </a>
                         <h2 style="text-align: left;">Top 5 energy-boosting morning routines</h2>
                         <p style="text-align: left;">Imagine waking up with more energy, more flexibility, with less stress and fewer instances of anxiously rushing out the door.</p>
@@ -594,7 +594,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6 px-0">
-                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_image_text_2.jpg" class="img w-100"/>
+                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text_2.jpg" class="img w-100"/>
                     </div>
                 </div>
             </div>
@@ -672,7 +672,7 @@
                     <div class="col-lg-4"></div>
                     <div class="col-lg-4 pt16 pb16" style="text-align: center;">
                         <a style="text-decoration:none;" href="http://www.example.com">
-                            <img src="/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_logo.png" width="70" style="height:auto;max-width:400px;width:70px"/>
+                            <img src="/mass_mailing_themes/static/src/img/theme_bignews/bignews_logo.png" width="70" style="height:auto;max-width:400px;width:70px"/>
                         </a>
                     </div>
                     <div class="col-lg-4" style="text-align:right"></div>
@@ -685,7 +685,7 @@
             </div>
         </div>
         <div class="s_cover o_mail_snippet_general pt0" data-snippet="s_cover" data-name="Cover">
-            <img src="/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_banner.jpg" alt="Cover image" class="img-fluid w-100 mx-auto" style="padding: 15px;"/>
+            <img src="/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_cover.jpg" alt="Cover image" class="img-fluid w-100 mx-auto" style="padding: 15px;"/>
         </div>
         <div class="s_text_block o_mail_snippet_general pt32 pb32" data-snippet="s_text_block" data-name="Text" style="padding-left: 15px; padding-right: 15px;">
             <div class="container s_allow_columns">