diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
index d7dc2cb19ab..58f28b3796e 100644
--- a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
@@ -3,7 +3,7 @@ import { computed } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["tags-admin-dropdown"],
-  classNames: "tags-admin-dropdown",
+  classNames: ["tags-admin-dropdown"],
   actionsMapping: null,
 
   selectKitOptions: {
@@ -35,7 +35,7 @@ export default DropdownSelectBoxComponent.extend({
   }),
 
   actions: {
-    onSelect(id) {
+    onChange(id) {
       const action = this.actionsMapping[id];
 
       if (action) {
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
index 0baa85400a8..0aa601db9a1 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
@@ -1,6 +1,4 @@
-{{#if selectKit.options.icon}}
-  {{d-icon selectKit.options.icon}}
-{{/if}}
+{{#each icons as |icon|}} {{d-icon icon}} {{/each}}
 
 {{component selectKit.options.selectedNameComponent
   tabindex=tabindex