diff --git a/addons/report/data/paperformat_defaults.xml b/addons/report/data/paperformat_defaults.xml
index 71077f10ab4..15d80ddc3fe 100644
--- a/addons/report/data/paperformat_defaults.xml
+++ b/addons/report/data/paperformat_defaults.xml
@@ -8,12 +8,12 @@
             <field name="page_height">0</field>
             <field name="page_width">0</field>
             <field name="orientation">Portrait</field>
-            <field name="margin_top">30</field>
+            <field name="margin_top">40</field>
             <field name="margin_bottom">20</field>
             <field name="margin_left">7</field>
             <field name="margin_right">7</field>
             <field name="header_line" eval="False" />
-            <field name="header_spacing">25</field>
+            <field name="header_spacing">35</field>
             <field name="dpi">90</field>
         </record>
 
@@ -24,13 +24,13 @@
             <field name="page_height">0</field>
             <field name="page_width">0</field>
             <field name="orientation">Portrait</field>
-            <field name="margin_top">50</field>
-            <field name="margin_bottom">18</field>
-            <field name="margin_left">10</field>
-            <field name="margin_right">10</field>
+            <field name="margin_top">40</field>
+            <field name="margin_bottom">20</field>
+            <field name="margin_left">7</field>
+            <field name="margin_right">7</field>
             <field name="header_line" eval="False" />
-            <field name="header_spacing">5</field>
-            <field name="dpi">110</field>
+            <field name="header_spacing">35</field>
+            <field name="dpi">90</field>
         </record>
 
         <record id="base.main_company" model="res.company">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 44c3aee763a..99fdc54c4fa 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -762,7 +762,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
         <div t-att-class="'name' not in fields and 'css_non_editable_mode_hidden'"><span itemprop="name" t-esc="name"/></div>
         <div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress">
             <div t-if="address and 'address' in fields" class='css_editable_mode_hidden'>
-                <i t-if="not options.get('no_marker')" class='fa fa-map-marker'/> <span itemprop="streetAddress" t-raw="address.replace('\n', (options.get('no_marker') and '&lt;br/&gt;') or (options.get('no_tag_br') and ', ') or '&lt;br/&gt; &amp;nbsp; &amp;nbsp; ')"/>
+                <i t-if="not options.get('no_marker')" class='fa fa-map-marker'/> <span itemprop="streetAddress" t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or ('&lt;br/&gt;%s' % ('' if options.get('no_marker') else '&amp;nbsp; &amp;nbsp; ')))"/>
             </div>
             <div t-if="city and 'city' in fields" class='css_editable_mode_hidden'>
                 <i t-if="not options.get('no_marker')" class='fa fa-map-marker'/> <span itemprop="addressLocality" t-raw="city"/>, <span itemprop="addressCountry" t-raw="country_id"/>