diff --git a/gui/preload-chat.js b/gui/preload-chat.js
index c8ee9654..e021463e 100644
--- a/gui/preload-chat.js
+++ b/gui/preload-chat.js
@@ -1657,8 +1657,8 @@ function getSetUserInformation(selected_callsign) {
       document.getElementById("dx_user_info_image").src = data.user_info_image;
 
       document.getElementById("dx_user_info_gridsquare").className = "";
-      document.getElementById("dx_user_info_name").className = "";
-      document.getElementById("dx_user_info_age").className = "";
+      document.getElementById("dx_user_info_name").className = "badge bg-secondary";
+      document.getElementById("dx_user_info_age").className = "badge bg-secondary";
       document.getElementById("dx_user_info_gridsquare").className = "";
       document.getElementById("dx_user_info_location").className = "";
       document.getElementById("dx_user_info_email").className = "";
diff --git a/gui/src/chat-module.html b/gui/src/chat-module.html
index d8fb5143..c5e9eef4 100644
--- a/gui/src/chat-module.html
+++ b/gui/src/chat-module.html
@@ -434,7 +434,7 @@
                       class="form-control"
                       placeholder="Comments"
                       id="user_info_comments"
-                      aria-label="Name"
+                      aria-label="Comments"
                       aria-describedby="basic-addon1"
                     />
                   </div>
@@ -478,39 +478,44 @@
               <div class="col-md-8">
                 <div class="card-body">
                   <h5>
-                    <span id="dx_user_info_callsign"></span> -
-                    <span id="dx_user_info_name"></span> (<span
+                    <span class="badge bg-secondary" id="dx_user_info_callsign"></span> -
+                    <span class="badge bg-secondary" id="dx_user_info_name"></span> <span class="badge bg-secondary"
                       id="dx_user_info_age"
                     ></span
-                    >)
+                    >
                   </h5>
 
                   <ul class="card-text list-unstyled">
                     <li>
-                      <strong class="col">Location: </strong
+                      <strong class="col"><i class="bi bi-house"></i
+                    > </strong
                       ><span id="dx_user_info_location"></span> (<span
                         id="dx_user_info_gridsquare"
                       ></span
                       >)
                     </li>
                     <li>
-                      <strong class="col">Email: </strong
+                      <strong class="col"><i class="bi bi-envelope"></i
+                    > </strong
                       ><span id="dx_user_info_email"></span>
                     </li>
                     <li>
-                      <strong class="col">Website: </strong
+                      <strong class="col"><i class="bi bi-globe"></i
+                    > </strong
                       ><span id="dx_user_info_website"></span>
                     </li>
                     <li>
-                      <strong class="col">Antenna: </strong
+                      <strong class="col"><i class="bi bi-broadcast-pin"></i
+                    > </strong
                       ><span id="dx_user_info_antenna"></span>
                     </li>
                     <li>
-                      <strong class="col">Radio: </strong
+                      <strong class="col"><i class="bi bi-projector"></i
+                    > </strong
                       ><span id="dx_user_info_radio"></span>
                     </li>
                     <li>
-                      <strong class="col">Comments: </strong
+                      <strong class="col"><i class="bi bi-info-circle"></i> </strong
                       ><span id="dx_user_info_comments"></span>
                     </li>
                   </ul>