diff --git a/client_side_nav.php b/client_side_nav.php
index b79a57274..af2881aa0 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -2,7 +2,14 @@
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
 
     <a class="brand-link pb-1 mt-1" href="clients.php">
-        <p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> Back | <strong><?php if($client_abbreviation) { echo $client_abbreviation; } else { echo shortenClient($client_name); } ?></strong></p>
+        <p class="h5">
+            <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
+             Back | 
+             <strong>
+                <?php if($client_abbreviation) { echo $client_abbreviation; } else { echo shortenClient($client_name); } ?>
+                <i class="fas fa-hashtag"></i><?php echo $client_id; ?>
+            </strong>
+        </p>
     </a>
 
     <!-- Sidebar -->
diff --git a/clients.php b/clients.php
index 1b1b04f88..49cc56d25 100644
--- a/clients.php
+++ b/clients.php
@@ -355,7 +355,7 @@ class="collapse mt-3
                         ?>
                         <tr>
                             <td>
-                                <a class="font-weight-bold" href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?> <small class='text-muted'>[ <?php echo $client_id; ?> ]</small></a>
+                                <a data-toggle="tooltip" data-placement="right" title="Client ID: <?php echo $client_id; ?>" class="font-weight-bold" href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
 
                                 <?php
                                 if (!empty($client_type)) {
diff --git a/inc_client_top_head.php b/inc_client_top_head.php
index 1065d0346..6cf5fdb04 100644
--- a/inc_client_top_head.php
+++ b/inc_client_top_head.php
@@ -2,7 +2,7 @@
     <div class="card-body py-2">
         <div class="row">
             <div class="col">
-                <a href="#" data-toggle="collapse" data-target="#clientHeader"><h4 class="text-secondary"><strong><?php echo $client_name; ?></strong> <?php if ($client_archived_at) { echo "(archived)"; } ?> <small>[ <?php echo $client_id; ?> ]</small></h4></a>
+                <a href="#" data-toggle="collapse" data-target="#clientHeader"><h4 class="text-secondary" data-toggle="tooltip" data-placement="right" title="Client ID: <?php echo $client_id; ?>"><strong><?php echo $client_name; ?></strong> <?php if ($client_archived_at) { echo "(archived)"; } ?></h4></a>
             </div>
             <div class="col">
                 <?php if ($session_user_role == 3) { ?>