diff --git a/assets/javascripts/discourse/components/result-types/json.hbs b/assets/javascripts/discourse/components/result-types/json.hbs
index 3fd4fe1..e1a9c62 100644
--- a/assets/javascripts/discourse/components/result-types/json.hbs
+++ b/assets/javascripts/discourse/components/result-types/json.hbs
@@ -3,7 +3,7 @@
   <DButton
     class="result-json-button"
     @action={{action "viewJson"}}
-    @icon="ellipsis-h"
+    @icon="ellipsis"
     @title="explorer.view_json"
   />
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/share-report.hbs b/assets/javascripts/discourse/components/share-report.hbs
index 11a0e7e..c9fcc94 100644
--- a/assets/javascripts/discourse/components/share-report.hbs
+++ b/assets/javascripts/discourse/components/share-report.hbs
@@ -15,7 +15,7 @@
 
       <DButton
         @action={{this.close}}
-        @icon="times"
+        @icon="xmark"
         @aria-label="share.close"
         @title="share.close"
         class="btn-flat close"
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 92eab6d..09316da 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -60,7 +60,7 @@
               />
               <DButton
                 @action={{this.exitEdit}}
-                @icon="times"
+                @icon="xmark"
                 class="previous"
               />
               <div class="name-text-field">
@@ -182,7 +182,7 @@
                   class="btn-edit-query"
                   @action={{this.editQuery}}
                   @label="explorer.edit"
-                  @icon="pencil-alt"
+                  @icon="pencil"
                 />
               {{/unless}}
             {{/if}}
@@ -198,7 +198,7 @@
               <DButton
                 @action={{this.showHelpModal}}
                 @label="explorer.help.label"
-                @icon="question-circle"
+                @icon="circle-question"
               />
             {{/if}}
           </div>
@@ -207,14 +207,14 @@
             {{#if this.selectedItem.destroyed}}
               <DButton
                 @action={{this.recover}}
-                @icon="undo"
+                @icon="arrow-rotate-left"
                 @label="explorer.recover"
               />
             {{else}}
               {{#if this.editingQuery}}
                 <DButton
                   @action={{this.discard}}
-                  @icon="undo"
+                  @icon="arrow-rotate-left"
                   @label="explorer.undo"
                   @disabled={{this.saveDisabled}}
                 />
@@ -222,7 +222,7 @@
 
               <DButton
                 @action={{this.destroyQuery}}
-                @icon="trash-alt"
+                @icon="trash-can"
                 @label="explorer.delete"
                 class="btn-danger"
               />