diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 47a34a6e6ec..16c93ace5de 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -1245,6 +1245,8 @@ class ReportSaleDetails(models.AbstractModel):
             payments = []
 
         return {
+            'date_start': date_start,
+            'date_stop': date_stop,
             'currency_precision': user_currency.decimal_places,
             'total_paid': user_currency.round(total),
             'payments': payments,
@@ -1264,8 +1266,15 @@ class ReportSaleDetails(models.AbstractModel):
     @api.model
     def _get_report_values(self, docids, data=None):
         data = dict(data or {})
+        # initialize data keys with their value if provided, else None
+        data.update({
+            'session_ids': data.get('session_ids') or docids,
+            'config_ids': data.get('config_ids'),
+            'date_start': data.get('date_start'),
+            'date_stop': data.get('date_stop')
+        })
         configs = self.env['pos.config'].browse(data['config_ids'])
-        data.update(self.get_sale_details(data['date_start'], data['date_stop'], configs.ids))
+        data.update(self.get_sale_details(data['date_start'], data['date_stop'], configs.ids, data['session_ids']))
         return data
 
 class AccountCashRounding(models.Model):
diff --git a/addons/point_of_sale/static/src/css/popups/closing_pos_popup.css b/addons/point_of_sale/static/src/css/popups/closing_pos_popup.css
index bbb3b25271f..e0adc1d1c18 100644
--- a/addons/point_of_sale/static/src/css/popups/closing_pos_popup.css
+++ b/addons/point_of_sale/static/src/css/popups/closing_pos_popup.css
@@ -138,6 +138,7 @@
         display: flex;
         flex-direction: column;
         height: unset;
+        padding-left: 0;
     }
 
     .pos .close-pos-popup .footer .button {
diff --git a/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js b/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js
index d8836a74cf2..f7617372029 100644
--- a/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js
+++ b/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js
@@ -73,6 +73,13 @@ odoo.define('point_of_sale.ClosePosPopup', function(require) {
         closeDetailsPopup() {
             this.state.displayMoneyDetailsPopup = false;
         }
+        async downloadSalesReport() {
+            await this.env.legacyActionManager.do_action('point_of_sale.sale_details_report', {
+                additional_context: {
+                    active_ids: [this.env.pos.pos_session.id],
+                },
+            });
+        }
         handleInputChange(paymentId) {
             let expectedAmount;
             if (paymentId === this.defaultCashDetails.id) {
diff --git a/addons/point_of_sale/static/src/xml/Chrome.xml b/addons/point_of_sale/static/src/xml/Chrome.xml
index 9a36cadcf0e..69003fcc4cf 100644
--- a/addons/point_of_sale/static/src/xml/Chrome.xml
+++ b/addons/point_of_sale/static/src/xml/Chrome.xml
@@ -18,7 +18,7 @@
                     <div class="search-bar-portal search-bar-container sb-product" />
                     <div class="status-buttons" t-if="state.uiState === 'READY'" t-att-class="{ oe_hidden: state.mobileSearchBarIsShown }">
                         <CashierName />
-                        <SaleDetailsButton t-if="env.proxy.printer" />
+                        <SaleDetailsButton t-if="env.proxy.printer" isHeaderButton="true"/>
                         <ProxyStatus t-if="env.pos.config.use_proxy" />
                         <CustomerFacingDisplayButton t-if="customerFacingDisplayButtonIsShown" />
                         <SyncNotification />
diff --git a/addons/point_of_sale/static/src/xml/ChromeWidgets/SaleDetailsButton.xml b/addons/point_of_sale/static/src/xml/ChromeWidgets/SaleDetailsButton.xml
index dc5ecc04109..020251dd46c 100644
--- a/addons/point_of_sale/static/src/xml/ChromeWidgets/SaleDetailsButton.xml
+++ b/addons/point_of_sale/static/src/xml/ChromeWidgets/SaleDetailsButton.xml
@@ -2,10 +2,10 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="SaleDetailsButton" owl="1">
-        <div class="oe_status">
-            <div class="js_connected oe_icon">
-                <i class="fa fa-fw fa-print" role="img" aria-label="Print" t-on-click="onClick"
-                   title="Print a report with all the sales of the current PoS Session"></i>
+        <div t-att-class="{'oe_status': props.isHeaderButton }" t-on-click="onClick">
+            <div class="js_connected oe_icon"
+                title="Print a report with all the sales of the current PoS Session">
+                <i class="fa fa-fw fa-print" role="img" aria-label="Print"></i>
             </div>
         </div>
     </t>
diff --git a/addons/point_of_sale/static/src/xml/Popups/ClosePosPopup.xml b/addons/point_of_sale/static/src/xml/Popups/ClosePosPopup.xml
index 16f6e951f98..024d4ca15e5 100644
--- a/addons/point_of_sale/static/src/xml/Popups/ClosePosPopup.xml
+++ b/addons/point_of_sale/static/src/xml/Popups/ClosePosPopup.xml
@@ -80,8 +80,16 @@
                     <div class="button highlight" t-on-click="onCloseSession">Close Session</div>
                     <div class="button" t-on-click="closePos" title="Visit the Backend but keep session open">Backend</div>
                     <div class="button" t-att-class="{'disabled': !canCancel()}" t-on-click="cancelPopup">Discard</div>
-                    <div class="small button icon"><i class="fa fa-print" role="img" title="Print the report"/></div>
-                    <div class="small button icon"><i class="fa fa-file-pdf-o" role="img" title="Download the report as PDF"/></div>
+                    <!-- Download Sale Details -->
+                    <div class="small button icon" 
+                        t-on-click="downloadSalesReport" 
+                        title="Download a report with all the sales of the current PoS Session">
+                            <i class="fa fa-download" role="img"/>
+                    </div>
+                    <!-- Print Sale Details -->
+                    <div t-if="env.proxy.printer" class="small button icon">
+                        <SaleDetailsButton/>
+                    </div>
                 </footer>
             </div>
             <MoneyDetailsPopup
diff --git a/addons/point_of_sale/views/point_of_sale_report.xml b/addons/point_of_sale/views/point_of_sale_report.xml
index 120557b56f2..9fc7d3ef157 100644
--- a/addons/point_of_sale/views/point_of_sale_report.xml
+++ b/addons/point_of_sale/views/point_of_sale_report.xml
@@ -12,7 +12,7 @@
 
     <record id="sale_details_report" model="ir.actions.report">
         <field name="name">Sales Details</field>
-        <field name="model">report.point_of_sale.report_saledetails</field>
+        <field name="model">pos.session</field>
         <field name="report_type">qweb-pdf</field>
         <field name="report_name">point_of_sale.report_saledetails</field>
     </record>
diff --git a/addons/point_of_sale/views/report_saledetails.xml b/addons/point_of_sale/views/report_saledetails.xml
index 5ca914f5502..2e836e53603 100644
--- a/addons/point_of_sale/views/report_saledetails.xml
+++ b/addons/point_of_sale/views/report_saledetails.xml
@@ -10,7 +10,9 @@
             <div class="text-center">
                 <h2>Sales Details</h2>
 
-                <strong><t t-esc="date_start" t-options="{'widget': 'datetime'}"/> - <t t-esc="date_stop" t-options="{'widget': 'datetime'}"/></strong>
+                <t t-if="date_start and date_stop">
+                    <strong><t t-esc="date_start" t-options="{'widget': 'datetime'}"/> - <t t-esc="date_stop" t-options="{'widget': 'datetime'}"/></strong>
+                </t>
             </div>
 
             <!-- Orderlines -->