diff --git a/html/ajax_search.php b/html/ajax_search.php
index 97541358a1..06fb8933ee 100644
--- a/html/ajax_search.php
+++ b/html/ajax_search.php
@@ -182,9 +182,9 @@ if (isset($_REQUEST['search'])) {
                     }
 
                     if ($result['bgpPeerRemoteAs'] == $result['bgpLocalAs']) {
-                        $bgp_image = '<i class="fa fa-square fa-lg icon-theme" aria-hidden="true"></i>';
+                        $bgp_image = 'fa fa-square fa-lg icon-theme';
                     } else {
-                        $bgp_image = '<i class="fa fa-external-link-square fa-lg icon-theme" aria-hidden="true"></i>';
+                        $bgp_image = 'fa fa-external-link-square fa-lg icon-theme';
                     }
 
                     $bgp[] = array(
diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php
index 1fe2e5f993..be5025ef4e 100644
--- a/resources/views/layouts/menu.blade.php
+++ b/resources/views/layouts/menu.blade.php
@@ -670,7 +670,7 @@
             valueKey: 'name',
             templates: {
                 header: '<h5><strong>&nbsp;BGP Sessions</strong></h5>',
-                suggestion: Handlebars.compile('<p><a href="@{{url}}"><small>@{{bgp_image}} @{{name}} - @{{hostname}}<br />AS@{{localas}} -> AS@{{remoteas}}</small></a></p>')
+                suggestion: Handlebars.compile('<p><a href="@{{url}}"><small><i class="@{{bgp_image}}" aria-hidden="true"></i> @{{name}} - @{{hostname}}<br />AS@{{localas}} -> AS@{{remoteas}}</small></a></p>')
             }
         }).on('typeahead:select', function (ev, suggestion) {
             window.location.href = suggestion.url;