diff --git a/addons/survey/__init__.py b/addons/survey/__init__.py
index c158f87e14f..56086d0fa5d 100644
--- a/addons/survey/__init__.py
+++ b/addons/survey/__init__.py
@@ -3,4 +3,5 @@
 
 from . import controllers
 from . import models
+from . import report
 from . import wizard
diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py
index 8254f0c43a6..5a1b14857db 100644
--- a/addons/survey/__manifest__.py
+++ b/addons/survey/__manifest__.py
@@ -23,8 +23,8 @@ sent mails with personal token for the invitation of the survey.
         'web_tour',
         'gamification'],
     'data': [
-        'views/survey_report_templates.xml',
-        'views/survey_reports.xml',
+        'report/survey_templates.xml',
+        'report/survey_reports.xml',
         'data/mail_template_data.xml',
         'security/survey_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/survey/views/survey_reports.xml b/addons/survey/report/survey_reports.xml
similarity index 100%
rename from addons/survey/views/survey_reports.xml
rename to addons/survey/report/survey_reports.xml
diff --git a/addons/survey/report/survey_templates.xml b/addons/survey/report/survey_templates.xml
new file mode 100644
index 00000000000..270d7c799a7
--- /dev/null
+++ b/addons/survey/report/survey_templates.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="certification_report_view_general">
+            <!-- Style classes to be applied to '#o_survey_certification': [no class](purple), gold, blue -->
+            <div id="o_survey_certification" t-att-data-oe-model="user_input._name" t-att-data-oe-id="user_input.id" 
+                t-attf-class="#{'article certification-wrapper ' + layout_template + ' ' + layout_color}">
+                <div class="certification">
+                    <div class="certification-seal" t-if="user_input.scoring_success and layout_template == 'modern'"/>
+                    <div class="certification-top">
+                        <h1><b>Certificate</b>
+                            <br/><span t-if="user_input.scoring_success">of achievement</span>
+                        </h1>
+                    </div>
+
+                    <div class="page certification-content">
+                        <div class="oe_structure"/>
+                        <div t-if="user_input.scoring_success">
+                        <div class="oe_structure"/>
+                            <p> <span>This certificate is presented to</span>
+                                <br/>
+                                <t t-set="certif_style" t-value="''"/>
+                                <t t-set="certified_name" t-value="user_input.partner_id.name or user_input.email or ''"/>
+                                <t t-if="certified_name.isupper()">
+                                    <t t-set="certif_style" t-value="certif_style + 'font-family: certification-serif;'"/>
+                                </t>
+                                <t t-if="len(certified_name) > 35 and layout_template == 'classic'">
+                                    <t t-set="certif_style" t-value="certif_style + 'font-size: 20px; line-height: 4; font-family: certification-serif; '"/>
+                                </t>
+                                <t t-elif="len(certified_name) > 20">
+                                    <t t-if="layout_template == 'modern'">
+                                        <t t-set="certif_style" t-value="certif_style + 'font-size: 40px; line-height: 4;'"/>
+                                    </t>
+                                    <t t-else="">
+                                        <t t-set="certif_style" t-value="certif_style + 'font-size: 30px; line-height: 4;'"/>
+                                    </t>
+                                </t>
+                                <span t-att-style="certif_style" class="user-name" t-esc="certified_name"/>
+
+                                <br/> <span>by</span> <span class="certification-company" t-field="user_input.create_uid.company_id.display_name"/> <span>for successfully completing</span>
+                                <br/><b><span class="certification-name" t-field="user_input.survey_id.display_name"/></b>
+                             </p>
+                            <div class="oe_structure"/>
+                        </div>
+                        <div t-else="" class="certification-failed">
+                            <p>Certification Failed</p>
+                            <div class="oe_structure"/>
+                        </div>
+                        <div class="oe_structure"/>
+                    </div>
+
+                    <div class="certification-bottom">
+                        <div class="oe_structure"/>
+                        <div class="certification-date-wrapper">
+                            <div class="certification-date" t-field="user_input.create_date" t-options='{"widget": "date"}'/>
+                            <span>Date</span>
+                        </div>
+                        <div class="certification-company">
+                            <span class="certification-company-logo" t-field="user_input.create_uid.company_id.logo" t-options="{'widget': 'image'}" role="img"/>
+                        </div>
+                    </div>
+                    <div t-if="user_input.test_entry" class="test-entry"/>
+                    <div class="certification-number" t-if="user_input.scoring_success">
+                        Certification n°<t t-esc="str(user_input.id).rjust(10, '0')"/>
+                    </div>
+                </div>
+            </div>
+        </template>
+
+        <template id="certification_report_view">
+            <t t-call="web.html_container">
+                <t t-foreach="docs" t-as="user_input">
+                    <t t-set="layout_values" t-value="user_input.survey_id.certification_report_layout.split('_') if user_input.survey_id.certification_report_layout else ['modern', 'purple']"/>
+                    <t t-set="layout_template" t-value="layout_values[0]"/>
+                    <t t-set="layout_color" t-value="layout_values[1]"/>
+                    <t t-call="survey.certification_report_view_general"/>
+                </t>
+            </t>
+        </template>
+    </data>
+</odoo>
diff --git a/addons/survey/static/src/scss/survey_reports.scss b/addons/survey/static/src/scss/survey_reports.scss
index 906a3078b1b..3366f18d47a 100644
--- a/addons/survey/static/src/scss/survey_reports.scss
+++ b/addons/survey/static/src/scss/survey_reports.scss
@@ -235,13 +235,14 @@
                     padding-left: 10mm;
                     right: 35mm;
                 }
-
-                .certification-number {
-                    bottom: -15mm;
-                    left: 50%;
-                    -webkit-transform: translateX(-50%);
-                    transform: translateX(-50%);
-                }
+            }
+            
+            .certification-number {
+                width: 40mm;
+                bottom: 5mm;
+                left: 50%;
+                -webkit-transform: translateX(-50%);
+                transform: translateX(-50%);
             }
         }
     }
diff --git a/addons/survey/views/survey_report_templates.xml b/addons/survey/views/survey_report_templates.xml
deleted file mode 100644
index fb46b1c3221..00000000000
--- a/addons/survey/views/survey_report_templates.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="certification_report_view_modern">
-            <!-- Style classes to be applyed to '#o_survey_certification': [no class](purple), gold, blue  -->
-            <div id="o_survey_certification" t-att-data-oe-model="user_input._name" t-att-data-oe-id="user_input.id" t-att-class="'article certification-wrapper modern %s' % layout_color">
-                <div class="certification">
-                    <div class="certification-seal" t-if="user_input.scoring_success"/>
-                    <div class="certification-top">
-                        <h1><b>Certificate</b>
-                            <br/><span t-if="user_input.scoring_success">of achievement</span>
-                        </h1>
-                    </div>
-
-                    <div class="certification-content">
-                        <div t-if="user_input.scoring_success">
-                            <p>This certificate is presented to
-                                <br/>
-                                <t t-set="certif_style" t-value="''"/>
-                                <t t-set="certified_name" t-value="user_input.partner_id.name or user_input.email or ''"/>
-                                <t t-if="certified_name.isupper()">
-                                    <t t-set="certif_style" t-value="certif_style + 'font-family: certification-serif;'"/>
-                                </t>
-                                <t t-if="len(certified_name) > 20">
-                                    <t t-set="certif_style" t-value="certif_style + 'font-size: 40px; line-height: 4;'"/>
-                                </t>
-                                <span t-att-style="certif_style" class="user-name" t-esc="certified_name"/>
-
-                                <br/>by <span class="certification-company" t-field="user_input.env.company.display_name"/> for successfully completing
-                                <br/><b><span class="certification-name" t-field="user_input.survey_id.display_name"/></b>
-                             </p>
-                        </div>
-                        <div t-else="" class="certification-failed">
-                            <p>Certification Failed</p>
-                        </div>
-                    </div>
-
-                    <div class="certification-bottom">
-                        <div class="certification-date-wrapper">
-                            <div class="certification-date" t-field="user_input.create_date" t-options='{"widget": "date"}'/>
-                            <span>Date</span>
-                        </div>
-                        <div class="certification-company">
-                            <span class="certification-company-logo" t-field="user_input.env.company.logo" t-options="{'widget': 'image'}" role="img"/>
-                        </div>
-
-                    </div>
-                    <div class="certification-number" t-if="user_input.scoring_success">
-                        Certification n°<t t-esc="str(user_input.id).rjust(10, '0')"/>
-                    </div>
-                </div>
-                <div t-if="user_input.test_entry" class="test-entry"/>
-            </div>
-        </template>
-
-        <template id="certification_report_view_classic">
-            <!-- Style classes to be applyed to '#o_survey_certification': [no class](purple), gold, blue  -->
-            <div id="o_survey_certification" t-att-data-oe-model="user_input._name" t-att-data-oe-id="user_input.id" t-att-class="'article certification-wrapper classic %s' % layout_color">
-                <div t-if="user_input.test_entry" class="test-entry"/>
-                <div class="certification">
-                    <div class="certification-top">
-                        <h1><b>Certificate</b>
-                            <br/><span t-if="user_input.scoring_success">of achievement</span>
-                        </h1>
-                    </div>
-
-                    <div class="certification-content">
-                        <div t-if="user_input.scoring_success">
-                            <p>This certificate is presented to
-                                 <t t-set="certif_style" t-value="''"/>
-                                <t t-set="certified_name" t-value="user_input.partner_id.name or user_input.email or ''"/>
-                                <t t-if="certified_name.isupper()">
-                                    <t t-set="certif_style" t-value="certif_style + 'font-family: certification-serif;'"/>
-                                </t>
-                                <t t-if="len(certified_name) > 35">
-                                    <t t-set="certif_style" t-value="certif_style + 'font-size: 20px; line-height: 4; font-family: certification-serif; '"/>
-                                </t>
-                                <t t-elif="len(certified_name) > 20">
-                                    <t t-set="certif_style" t-value="certif_style + 'font-size: 30px; line-height: 4;'"/>
-                                </t>
-                                <br/>
-                                <span t-att-style="certif_style" class="user-name" t-esc="certified_name"/>
-
-                                <br/>by <span class="certification-company" t-field="user_input.env.company.display_name"/>
-                                for successfully completing
-                                <br/><b><span class="certification-name" t-field="user_input.survey_id.display_name"/></b>
-                             </p>
-                        </div>
-                        <div t-else="" class="certification-failed">
-                            <p>Certification Failed</p>
-                        </div>
-                    </div>
-
-                    <div class="certification-bottom">
-                            <div class="certification-date-wrapper">
-                                <b><div class="certification-date" t-field="user_input.create_date" t-options='{"widget": "date"}'/></b>
-                                <span>Date</span>
-                            </div>
-                            <div class="certification-seal"/>
-                            <div class="certification-company">
-                                <span class="certification-company-logo" t-field="user_input.env.company.logo" t-options="{'widget': 'image'}" role="img"/>
-                            </div>
-                        <div class="certification-number" t-if="user_input.scoring_success">
-                            Certification n°<t t-esc="str(user_input.id).rjust(10, '0')"/>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </template>
-
-        <template id="certification_report_view">
-            <t t-call="web.html_container">
-                <t t-foreach="docs" t-as="user_input">
-                    <t t-set="layout_values" t-value="user_input.survey_id.certification_report_layout.split('_') if user_input.survey_id.certification_report_layout else ['modern', 'purple']"/>
-                    <t t-set="layout_template" t-value="'survey.certification_report_view_%s' % (layout_values[0])"/>
-                    <t t-set="layout_color" t-value="layout_values[1]"/>
-                    <t t-call="{{layout_template}}"/>
-                </t>
-            </t>
-        </template>
-    </data>
-</odoo>