diff --git a/client_invoices.php b/client_invoices.php
index 8c243251..6dd65515 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -143,7 +143,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
             <td><?php echo $invoice_scope_display; ?></td>
-            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($invoice_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($invoice_currency_code); ?> <?php echo number_format($invoice_amount,2); ?></td>
             <td><?php echo $invoice_date; ?></td>
             <td><div class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></div></td>
             <td><?php echo $category_name; ?></td>
diff --git a/client_quotes.php b/client_quotes.php
index 4e9577fe..cf710418 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -134,7 +134,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
             <td><?php echo $quote_scope_display; ?></td>
-            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($quote_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($quote_currency_code); ?> <?php echo number_format($quote_amount,2); ?></td>
             <td><?php echo $quote_date; ?></td>
             <td><?php echo $category_name; ?></td>
             <td>
diff --git a/client_recurring.php b/client_recurring.php
index 13fc69e4..46de45da 100644
--- a/client_recurring.php
+++ b/client_recurring.php
@@ -129,7 +129,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 <td><a href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>"><?php echo "$recurring_prefix$recurring_number"; ?></a></td>
                 <td><?php echo $recurring_scope; ?></td>
                 <td><?php echo ucwords($recurring_frequency); ?>ly</td>
-                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($recurring_amount,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($recurring_currency_code); ?> <?php echo number_format($recurring_amount,2); ?></td>
                 <td><?php echo $recurring_last_sent; ?></td>
                 <td><?php echo $recurring_next_date; ?></td>
                 <td><?php echo $category_name; ?></td>
diff --git a/invoices.php b/invoices.php
index 859b521e..29ebc338 100644
--- a/invoices.php
+++ b/invoices.php
@@ -343,7 +343,7 @@
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
             <td><?php echo $invoice_scope_display; ?></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=invoices"><?php echo $client_name; ?></a></td>
-            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($invoice_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($invoice_currency_code); ?> <?php echo number_format($invoice_amount,2); ?></td>
             <td><?php echo $invoice_date; ?></td>
             <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
             <td><?php echo $category_name; ?></td>
diff --git a/quotes.php b/quotes.php
index e5992e80..79d3e4c6 100644
--- a/quotes.php
+++ b/quotes.php
@@ -209,7 +209,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
             <td><?php echo $quote_scope_display; ?></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=quotes"><?php echo $client_name; ?></a></td>
-            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($quote_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($quote_currency_code); ?> <?php echo number_format($quote_amount,2); ?></td>
             <td><?php echo $quote_date; ?></td>
             <td><?php echo $category_name; ?></td>
             <td>
diff --git a/recurring.php b/recurring.php
index e860481c..ea758344 100644
--- a/recurring.php
+++ b/recurring.php
@@ -201,7 +201,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $recurring_scope; ?></td>
             <td><?php echo ucwords($recurring_frequency); ?>ly</td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=recurring"><?php echo $client_name; ?></a></td>
-            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($recurring_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($recurring_currency_code); ?> <?php echo number_format($recurring_amount,2); ?></td>
             <td><?php echo $recurring_last_sent; ?></td>
             <td><?php echo $category_name; ?></td>
             <td>