diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index c51115e6e21..9e4e8d95999 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -926,9 +926,8 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                 "widget": "contact",
                 "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/>
     </address>
-     <a t-att-href="res_company.google_map_link()" target="_BLANK">
-        <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
-    </a>
+    <!-- FORWARD-PORT UP TO SAAS-12 -->
+     <a t-att-href="res_company.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
 </template>
 
 <template id="contactus" name="Contact us" page="True">
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 2754c924af5..019ca6fcbff 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -331,9 +331,8 @@
                     <h4>Where</h4>
                 </div>
                 <div class="panel-body">
-                    <a t-att-href="event.google_map_link()" target="_BLANK">
-                        <img t-att-src="event.google_map_img()" width="100%%"/>
-                    </a>
+                    <!-- FORWARD-PORT UP TO SAAS-12 -->
+                    <a t-att-href="event.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
                     <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-field-options='{
                         "widget": "contact",
                         "fields": ["address", "phone", "mobile", "fax", "email"]