diff --git a/assets/javascripts/discourse/components/query-row-content.js.es6 b/assets/javascripts/discourse/components/query-row-content.js.es6
index c256d77..aa7e020 100644
--- a/assets/javascripts/discourse/components/query-row-content.js.es6
+++ b/assets/javascripts/discourse/components/query-row-content.js.es6
@@ -1,6 +1,7 @@
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
 import { bufferedRender } from "discourse-common/lib/buffered-render";
+import { iconHTML, convertIconClass } from "discourse-common/lib/icon-library";
 
 function icon_or_image_replacement(str, ctx) {
   str = Ember.get(ctx.contexts[0], str);
@@ -8,8 +9,9 @@ function icon_or_image_replacement(str, ctx) {
     return "";
   }
 
-  if (str.indexOf("fa-") === 0) {
-    return new Handlebars.SafeString("<i class='fa " + str + "'></i>");
+  if (str.indexOf("fa-") > -1) {
+    const icon = iconHTML(convertIconClass(str));
+    return new Handlebars.SafeString(icon);
   } else {
     return new Handlebars.SafeString("<img src='" + str + "'>");
   }
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index abab1a4..ecb1379 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -19,7 +19,7 @@
 
       {{#if othersDirty}}
         <div class="warning">
-          {{fa-icon "warning"}}
+          {{d-icon "warning"}}
           {{i18n "explorer.others_dirty"}}
         </div>
       {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs b/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs
index e349dd1..bb2527c 100644
--- a/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs
+++ b/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs
@@ -1,8 +1,8 @@
 <div class="schema-table-name">
   {{#if table.open}}
-    <i class="fa fa-caret-down"></i>
+    {{d-icon "caret-down"}}
   {{else}}
-    <i class="fa fa-caret-right"></i>
+    {{d-icon "caret-right"}}
   {{/if}}
   {{table.name}}
 </div>
@@ -13,7 +13,7 @@
       <div>
       <dt class="{{if col.sensitive "sensitive"}}" title="{{if col.sensitive (i18n "explorer.schema.sensitive")}}">
         {{#if col.sensitive}}
-          <i class="fa fa-warning"></i>
+          {{d-icon "warning"}}
         {{/if}}
         {{col.column_name}}
       </dt>
@@ -22,14 +22,15 @@
         {{#if col.havetypeinfo}}
           <br>
           {{#if col.havepopup}}
-            <i class="fa fa-info popup-info">
+            <div class="popup-info">
+              {{d-icon "info"}}
               <div class="popup">
                 {{col.column_desc}}
                 {{#if col.enum}}
                   {{explorer-schema-enuminfo col=col}}
                 {{/if}}
               </div>
-            </i>
+            </div>
           {{/if}}
           <span class="schema-typenotes">
             {{col.notes}}
diff --git a/assets/javascripts/discourse/templates/components/json-file-uploader.hbs b/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
index b34f6c4..1173a4d 100644
--- a/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
+++ b/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
@@ -8,5 +8,5 @@
   <div class="jsfu-paste">
     {{textarea value=value}}
   </div>
-  <div class="jsfu-shade {{if hover '' 'hidden'}}"><span class="text">{{fa-icon "upload"}}</span></div>
+  <div class="jsfu-shade {{if hover '' 'hidden'}}"><span class="text">{{d-icon "upload"}}</span></div>
 </div>
diff --git a/assets/javascripts/discourse/templates/explorer/post.raw.hbs b/assets/javascripts/discourse/templates/explorer/post.raw.hbs
index bafa4cc..662e191 100644
--- a/assets/javascripts/discourse/templates/explorer/post.raw.hbs
+++ b/assets/javascripts/discourse/templates/explorer/post.raw.hbs
@@ -2,7 +2,6 @@
   <aside class="quote" data-post="{{post.post_number}}" data-topic="{{post.topic_id}}">
     <div class="title">
       <div class="quote-controls">
-        {{!<i class="fa fa-chevron-down" title="expand/collapse"></i>}}
         <a href="/t/via-quote/{{post.topic_id}}/{{post.post_number}}"
           title="go to the quoted post"
           class="quote-other-topic">
diff --git a/plugin.rb b/plugin.rb
index 4ef8ae4..2b7897c 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -7,8 +7,15 @@
 enabled_site_setting :data_explorer_enabled
 register_asset 'stylesheets/explorer.scss'
 
-register_svg_icon "upload" if respond_to?(:register_svg_icon)
-register_svg_icon "chevron-left" if respond_to?(:register_svg_icon)
+if respond_to?(:register_svg_icon)
+  register_svg_icon "caret-down"
+  register_svg_icon "caret-right"
+  register_svg_icon "chevron-left"
+  register_svg_icon "exclamation-circle"
+  register_svg_icon "info"
+  register_svg_icon "pencil-alt"
+  register_svg_icon "upload"
+end
 
 # route: /admin/plugins/explorer
 add_admin_route 'explorer.title', 'explorer'