diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 4be65cb7..f4f07b28 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -180,11 +180,11 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
         <div class="col-sm-4">
           <table class="table">
             <tr>
-              <td>Invoice Date</td>
+              <td>Date</td>
               <td class="text-right"><?php echo $invoice_date; ?></td>
             </tr>
             <tr>
-              <td>Due Date</td>
+              <td>Due</td>
               <td class="text-right"><div class="<?php echo $invoice_color; ?>"><?php echo $invoice_due; ?></div></td>
             </tr>
           </table>
@@ -377,7 +377,7 @@ var docDefinition = {
 		      [ 
 		      	{},
 		      	{
-							text: 'Invoice Date',
+							text: 'Date',
 							style: 'invoiceDateTitle'
 						}, 
 						{
@@ -388,7 +388,7 @@ var docDefinition = {
 		      [ 
 		      	{},
 		      	{
-							text: 'Due Date',
+							text: 'Due',
 							style: 'invoiceDateTitle'
 						}, 
 						{
diff --git a/guest_view_quote.php b/guest_view_quote.php
index eda38cec..57eb17c1 100644
--- a/guest_view_quote.php
+++ b/guest_view_quote.php
@@ -141,7 +141,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
         <div class="col-sm-4">
           <table class="table">
             <tr>
-              <td>Quote Date</td>
+              <td>Date</td>
               <td class="text-right"><?php echo $quote_date; ?></td>
             </tr>
           </table>
@@ -332,7 +332,7 @@ var docDefinition = {
 		      [ 
 		      	{},
 		      	{
-							text: 'Quote Date',
+							text: 'Date',
 							style: 'invoiceDateTitle'
 						}, 
 						{
diff --git a/invoice.php b/invoice.php
index 829f6db9..593b8716 100644
--- a/invoice.php
+++ b/invoice.php
@@ -220,11 +220,11 @@ if(isset($_GET['invoice_id'])){
       <div class="col-sm-4">
         <table class="table">
           <tr>
-            <td>Invoice Date</td>
+            <td>Date</td>
             <td class="text-right"><?php echo $invoice_date; ?></td>
           </tr>
           <tr>
-            <td>Due Date</td>
+            <td>Due</td>
             <td class="text-right"><?php echo $invoice_due; ?></td>
           </tr>
         </table>
@@ -601,7 +601,7 @@ var docDefinition = {
 		      [ 
 		      	{},
 		      	{
-							text: 'Invoice Date',
+							text: 'Date',
 							style: 'invoiceDateTitle'
 						}, 
 						{
@@ -612,7 +612,7 @@ var docDefinition = {
 		      [ 
 		      	{},
 		      	{
-							text: 'Due Date',
+							text: 'Due',
 							style: 'invoiceDateTitle'
 						}, 
 						{
diff --git a/quote.php b/quote.php
index 3c0cde8b..08995eda 100644
--- a/quote.php
+++ b/quote.php
@@ -188,7 +188,7 @@ if(isset($_GET['quote_id'])){
       <div class="col-sm-4">
         <table class="table">
           <tr>
-            <td>Quote Date</td>
+            <td>Date</td>
             <td class="text-right"><?php echo $quote_date; ?></td>
           </tr>
         </table>
@@ -506,7 +506,7 @@ var docDefinition = {
 		      [ 
 		      	{},
 		      	{
-							text: 'Quote Date',
+							text: 'Date',
 							style: 'invoiceDateTitle'
 						}, 
 						{
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 2f1d762d..6d6e9e8b 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -21,7 +21,7 @@ if(isset($_GET['recurring_id'])){
   $recurring_scope = htmlentities($row['recurring_scope']);
   $recurring_frequency = htmlentities($row['recurring_frequency']);
   $recurring_status = htmlentities($row['recurring_status']);
-  $recurring_created_at = $row['recurring_created_at'];
+  $recurring_created_at = date('Y-m-d',strtotime($row['recurring_created_at']));
   $recurring_last_sent = $row['recurring_last_sent'];
   if($recurring_last_sent == 0){
     $recurring_last_sent = '-';
@@ -30,7 +30,6 @@ if(isset($_GET['recurring_id'])){
   $recurring_amount = floatval($row['recurring_amount']);
   $recurring_currency_code = htmlentities($row['recurring_currency_code']);
   $recurring_note = htmlentities($row['recurring_note']);
-  $recurring_created_at = $row['recurring_created_at'];
   $category_id = $row['recurring_category_id'];
   $client_id = $row['client_id'];
   $client_name = htmlentities($row['client_name']);