diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index b708bd36bf..a5bbd692a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2781,6 +2781,10 @@ td.bundle {
             }
         }
     }
+
+    .badge {
+        font-size: 90%;
+    }
 }
 
 .ui-autocomplete-loading {
@@ -4337,11 +4341,8 @@ div .suggestion_note {
 
 .ac-library {
     background-color: #EEE !important;
-    border-radius: 4px;
+    font-weight: normal;
     color: #000;
-    display: inline-block;
-    font-size: 80%;
-    padding: 1px 4px !important;
 }
 
 .ac-currentlibrary {
@@ -4351,6 +4352,10 @@ div .suggestion_note {
     }
 }
 
+.badge + .badge {
+    margin-left: .3rem;
+}
+
 .currentlibrary {
     background-color: #E6FCB7 !important;
     display: inline-block;
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index abf7400730..48407214bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -705,7 +705,7 @@ function patron_autocomplete(node, options) {
                     " " +
                     (item.other_name ? "(" + item.other_name.escapeHtml() + ")" : "") +
                     cardnumber.escapeHtml() +
-                    " <small>" +
+                    " " +
                     (item.date_of_birth
                         ? $date(item.date_of_birth) +
                           '<span class="age_years"> (' +
@@ -721,15 +721,19 @@ function patron_autocomplete(node, options) {
                     }) +
                     " " +
                     (!singleBranchMode
-                        ? '<span class="ac-library">' +
+                        ? '<span class="badge ac-library">' +
                           item.library.name.escapeHtml() +
                           "</span>"
                         : "") +
-                    "</small>" +
                     (expired
-                        ? '<small><span class="circ-hlt">' +
-                          __("expired") +
-                          "</span></small>"
+                        ? '<span class="badge text-bg-warning">' +
+                          __("Expired") +
+                          "</span>"
+                        : "") +
+                    (item.restricted
+                        ? '<span class="badge text-bg-danger">' +
+                          __("Restricted") +
+                          "</span>"
                         : "") +
                     "</a>"
             )