diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
index b5625ff..613577a 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
@@ -120,11 +120,12 @@ export default Ember.Controller.extend({
     },
 
     sortByProperty(property) {
-      if (this.sortBy == `${property}:desc`){
-        this.set('sortBy', [`${property}:asc`]);}
-      else {
+      if (this.sortBy[0] === `${property}:desc`) {
+        this.set('sortBy', [`${property}:asc`]);
+      } else {
         this.set('sortBy', [`${property}:desc`]);
-    }},
+      }
+    },
 
     create() {
       const name = this.get("newQueryName").trim();
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 3f06a02..ccc3129 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -148,15 +148,15 @@
         <table class="recent-queries">
           <thead class="heading-container">
             <th {{action "sortByProperty" "name"}} class="col heading name">
-              <i class="fa fa-sort"></i>
+              {{d-icon "sort"}}
               {{i18n 'explorer.query_name'}}
             </th>
             <th {{action "sortByProperty" "username"}} class="col heading user">
-              <i class="fa fa-sort"></i>
+              {{d-icon "sort"}}
               {{i18n 'explorer.query_user'}}
             </th>
             <th {{action "sortByProperty" "last_run_at"}} class="col heading time">
-              <i class="fa fa-sort"></i>
+              {{d-icon "sort"}}
               {{i18n 'explorer.query_time'}}
             </th>
           </thead>