diff --git a/src/assets/js/search.js b/src/assets/js/search.js
index 1353ffe2e..28767996b 100644
--- a/src/assets/js/search.js
+++ b/src/assets/js/search.js
@@ -70,7 +70,7 @@ $(function() {
             this.pullMatches(matches, this.result._highlightResult.aliases);
             this.pullMatches(matches, this.result._highlightResult.synonyms);
 
-            return this.template({ result: this.result, matches: matches.join(", ") });
+            return this.template({ result: this.result, matches: matches });
         },
 
         pullMatches: function(matches, list) {
@@ -84,7 +84,6 @@ $(function() {
         }
     });
 
-
     var $searchViewElement = $("[data-view=search]");
 
     if ($searchViewElement.length > 0) {
diff --git a/src/icons.html b/src/icons.html
index 215eecdf9..2f1513fcf 100644
--- a/src/icons.html
+++ b/src/icons.html
@@ -87,7 +87,10 @@ relative_path: ../
   <script type="text/template" id="result-template">
     <div class="fa-hover col-md-3 col-sm-4">
       <a href="{{ page.relative_path }}icon/<%= result.name %>">
-        <i class="fa <%= result.css_class %>"></i> <%= result._highlightResult.name.value %> <% if (matches !== "") { %>(<%= matches %>)<% } %>
+        <i class="fa <%= result.css_class %>"></i> <%= result._highlightResult.name.value %>
+        <% if (matches.length > 0) { %>
+          <span class="text-muted">(<%= matches.join(", ") %>)</span>
+        <% } %>
       </a>
     </div>
   </script>