diff --git a/expenses.php b/expenses.php
index 28e0b6ce..30b0a8bb 100644
--- a/expenses.php
+++ b/expenses.php
@@ -305,8 +305,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             require "expense_refund_modal.php";
 
-                            require "expense_export_modal.php";
-
 
                         }
 
@@ -328,5 +326,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once "expense_add_modal.php";
+require_once "expense_export_modal.php";
 
 require_once "footer.php";
diff --git a/invoice_export_modal.php b/invoice_export_modal.php
new file mode 100644
index 00000000..1dc8f889
--- /dev/null
+++ b/invoice_export_modal.php
@@ -0,0 +1,44 @@
+<div class="modal" id="exportInvoicesModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Export Invoices to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
+
+                    <?php require_once "inc_export_warning.php";
+ ?>
+
+                    <div class="form-group">
+                        <label>Date From</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Date To</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="export_invoices_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/invoices.php b/invoices.php
index e5f3eff1..daed0333 100644
--- a/invoices.php
+++ b/invoices.php
@@ -189,6 +189,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo $dtt; ?>">
                             </div>
                         </div>
+                        <div class="col-md-12">
+                            <div class="float-right">
+                                <button type="button" class="btn btn-default mt-4" data-toggle="modal" data-target="#exportInvoicesModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -312,6 +317,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once "invoice_add_modal.php";
+require_once "invoice_export_modal.php";
 
 require_once "footer.php";
 
diff --git a/post/invoice.php b/post/invoice.php
index eeade755..11e874c8 100644
--- a/post/invoice.php
+++ b/post/invoice.php
@@ -1253,6 +1253,57 @@ if (isset($_POST['export_client_invoices_csv'])) {
 
 }
 
+if (isset($_POST['export_invoices_csv'])) {
+    $date_from = sanitizeInput($_POST['date_from']);
+    $date_to = sanitizeInput($_POST['date_to']);
+    if (!empty($date_from) && !empty($date_to)) {
+        $date_query = "DATE(invoice_date) BETWEEN '$date_from' AND '$date_to'";
+        $file_name_date = "$date_from-to-$date_to";
+    }else{
+        $date_query = "";
+        $file_name_date = date('Y-m-d');
+    }
+
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE $date_query ORDER BY invoice_number ASC");
+
+    $row = mysqli_fetch_array($sql);
+    $client_name = $row['client_name'];
+
+    if ($sql->num_rows > 0) {
+        $delimiter = ",";
+        $filename = "$session_company_name-Invoices-$file_name_date.csv";
+
+        //create a file pointer
+        $f = fopen('php://memory', 'w');
+
+        //set column headers
+        $fields = array('Invoice Number', 'Scope', 'Amount', 'Issued Date', 'Due Date', 'Status');
+        fputcsv($f, $fields, $delimiter);
+
+        //output each row of the data, format line as csv and write to file pointer
+        while($row = $sql->fetch_assoc()) {
+            $lineData = array($row['invoice_prefix'] . $row['invoice_number'], $row['invoice_scope'], $row['invoice_amount'], $row['invoice_date'], $row['invoice_due'], $row['invoice_status'], $row['client_name']);
+            fputcsv($f, $lineData, $delimiter);
+        }
+
+        //move back to beginning of file
+        fseek($f, 0);
+
+        //set headers to download file rather than displayed
+        header('Content-Type: text/csv');
+        header('Content-Disposition: attachment; filename="' . $filename . '";');
+
+        //output all remaining data on a file pointer
+        fpassthru($f);
+    }
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Export', log_description = '$session_name exported invoices to CSV File', log_ip = '$session_ip', log_user_agent = '$session_user_agent',  log_user_id = $session_user_id");
+    
+    exit;
+
+}
+
 if (isset($_POST['export_client_recurring_csv'])) {
     $client_id = intval($_POST['client_id']);