diff --git a/invoice.php b/invoice.php
index c1849e27..80a9e7ea 100644
--- a/invoice.php
+++ b/invoice.php
@@ -144,12 +144,18 @@ if (isset($_GET['invoice_id'])) {
     ?>
 
     <ol class="breadcrumb d-print-none">
+        <?php if (isset($_GET['client_id'])) { ?>
+        <li class="breadcrumb-item">
+            <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+        </li>
+        <li class="breadcrumb-item">
+            <a href="client_invoices.php?client_id=<?php echo $client_id; ?>">Invoices</a>
+        </li>
+        <?php } else { ?>
         <li class="breadcrumb-item">
             <a href="invoices.php">Invoices</a>
         </li>
-        <li class="breadcrumb-item">
-            <a href="client_invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-        </li>
+        <?php } ?>
         <li class="breadcrumb-item active"><?php echo "$invoice_prefix$invoice_number"; ?></li>
         <?php if (isset($invoice_overdue)) { ?>
             <span class="p-2 ml-2 badge badge-danger"><?php echo $invoice_overdue; ?></span>
diff --git a/quote.php b/quote.php
index 3f6a7add..48c2bf46 100644
--- a/quote.php
+++ b/quote.php
@@ -107,12 +107,18 @@ if (isset($_GET['quote_id'])) {
 ?>
 
     <ol class="breadcrumb d-print-none">
+        <?php if (isset($_GET['client_id'])) { ?>
+        <li class="breadcrumb-item">
+            <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+        </li>
+        <li class="breadcrumb-item">
+            <a href="client_quotes.php?client_id=<?php echo $client_id; ?>">Quotes</a>
+        </li>
+        <?php } else { ?>
         <li class="breadcrumb-item">
             <a href="quotes.php">Quotes</a>
         </li>
-        <li class="breadcrumb-item">
-            <a href="client_quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-        </li>
+        <?php } ?>
         <li class="breadcrumb-item active"><?php echo "$quote_prefix$quote_number"; ?></li>
     </ol>
 
diff --git a/recurring_invoice.php b/recurring_invoice.php
index c396199b..213221e8 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -90,12 +90,18 @@ if (isset($_GET['recurring_id'])) {
     ?>
 
     <ol class="breadcrumb d-print-none">
+        <?php if (isset($_GET['client_id'])) { ?>
+        <li class="breadcrumb-item">
+            <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+        </li>
+        <li class="breadcrumb-item">
+            <a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>">Recurring Invoices</a>
+        </li>
+        <?php } else { ?>
         <li class="breadcrumb-item">
             <a href="recurring_invoices.php">Recurring Invoices</a>
         </li>
-        <li class="breadcrumb-item">
-            <a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>"> <?php echo $client_name; ?></a>
-        </li>
+        <?php } ?>
         <li class="breadcrumb-item active"><?php echo "$recurring_prefix$recurring_number"; ?></li>
     </ol>
 
diff --git a/ticket.php b/ticket.php
index 22abe41c..6cbbd539 100644
--- a/ticket.php
+++ b/ticket.php
@@ -344,13 +344,20 @@ if (isset($_GET['ticket_id'])) {
 
         <!-- Breadcrumbs-->
         <ol class="breadcrumb d-print-none">
+            <?php if (isset($_GET['client_id'])) { ?>
+            <li class="breadcrumb-item">
+                <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="client_tickets.php?client_id=<?php echo $client_id; ?>">Tickets</a>
+            </li>
+            <li class="breadcrumb-item active"><i class="fas fa-life-ring mr-1"></i><?php echo "$ticket_prefix$ticket_number";?></li>
+            <?php } else { ?>
             <li class="breadcrumb-item">
                 <a href="tickets.php">Tickets</a>
             </li>
-            <li class="breadcrumb-item">
-                <a href="client_tickets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-            </li>
-            <li class="breadcrumb-item active">Ticket Details</li>
+            <li class="breadcrumb-item active"><i class="fas fa-life-ring mr-1"></i><?php echo "$ticket_prefix$ticket_number";?></li>
+            <?php } ?>
         </ol>
 
         <div class="card">