diff --git a/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
index 1f1da87149..aaf32f8259 100644
--- a/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
@@ -8,7 +8,7 @@ export default DropdownSelectBoxComponent.extend({
   actionsMapping: null,
 
   selectKitOptions: {
-    icons: ["bars", "caret-down"],
+    icons: ["wrench", "caret-down"],
     showFullTitle: false,
   },
 
@@ -18,7 +18,7 @@ export default DropdownSelectBoxComponent.extend({
         id: "manageGroups",
         name: I18n.t("tagging.manage_groups"),
         description: I18n.t("tagging.manage_groups_description"),
-        icon: "wrench",
+        icon: "tags",
       },
       {
         id: "uploadTags",
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index 5919b91f98..7d3abc4e98 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -24,14 +24,14 @@
           class="btn-default edit-category"
           action=editCategory
           icon="wrench"
-          label="category.edit"}}
+          ariaLabel="category.edit"}}
       {{/if}}
     {{/unless}}
   {{/if}}
 
   {{#if tag}}
     {{#if showToggleInfo}}
-      {{d-button icon="tag" class="btn-default" label="tagging.info" action=toggleInfo id="show-tag-info"}}
+      {{d-button icon="wrench" class="btn-default" ariaLabel="tagging.info" action=toggleInfo id="show-tag-info"}}
     {{/if}}
   {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
index 1c291acc11..698324b9ab 100644
--- a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
@@ -9,7 +9,7 @@ export default DropdownSelectBoxComponent.extend({
   fixedCateoryPositions: setting("fixed_category_positions"),
 
   selectKitOptions: {
-    icon: "wrench",
+    icons: ["wrench", "caret-down"],
     showFullTitle: false,
     autoFilterable: false,
     filterable: false,
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 9dd5bd04a9..ce5d6144db 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -29,7 +29,6 @@
           flex: 0 0 100%;
           overflow: hidden;
           font-size: $font-up-2;
-          align-self: center;
           margin-right: 0;
         }
       }
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index ff1b4f7192..a522207e7d 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -188,6 +188,7 @@ module SvgSprite
     "sync",
     "table",
     "tag",
+    "tags",
     "tasks",
     "thermometer-three-quarters",
     "thumbs-down",