diff --git a/extensions/tags/composer.json b/extensions/tags/composer.json
index 12bf55381..7b0e14988 100644
--- a/extensions/tags/composer.json
+++ b/extensions/tags/composer.json
@@ -29,7 +29,7 @@
         "flarum-extension": {
             "title": "Tags",
             "icon": {
-                "name": "tags",
+                "name": "fa fa-tags",
                 "backgroundColor": "#F28326",
                 "color": "#fff"
             }
diff --git a/extensions/tags/js/admin/src/addTagChangePermission.js b/extensions/tags/js/admin/src/addTagChangePermission.js
index a8c5555c2..88a0536cf 100644
--- a/extensions/tags/js/admin/src/addTagChangePermission.js
+++ b/extensions/tags/js/admin/src/addTagChangePermission.js
@@ -5,7 +5,7 @@ import SettingDropdown from 'flarum/components/SettingDropdown';
 export default function() {
   extend(PermissionGrid.prototype, 'startItems', items => {
     items.add('allowTagChange', {
-      icon: 'tag',
+      icon: 'fa fa-tag',
       label: app.translator.trans('flarum-tags.admin.permissions.allow_edit_tags_label'),
       setting: () => {
         const minutes = parseInt(app.data.settings.allow_tag_change, 10);
diff --git a/extensions/tags/js/admin/src/addTagPermission.js b/extensions/tags/js/admin/src/addTagPermission.js
index 1a09145b0..c88fa837a 100644
--- a/extensions/tags/js/admin/src/addTagPermission.js
+++ b/extensions/tags/js/admin/src/addTagPermission.js
@@ -4,7 +4,7 @@ import PermissionGrid from 'flarum/components/PermissionGrid';
 export default function() {
   extend(PermissionGrid.prototype, 'moderateItems', items => {
     items.add('tag', {
-      icon: 'tag',
+      icon: 'fa fa-tag',
       label: app.translator.trans('flarum-tags.admin.permissions.tag_discussions_label'),
       permission: 'discussion.tag'
     }, 95);
diff --git a/extensions/tags/js/admin/src/addTagsPane.js b/extensions/tags/js/admin/src/addTagsPane.js
index 56bbb9b98..68f55a0ba 100644
--- a/extensions/tags/js/admin/src/addTagsPane.js
+++ b/extensions/tags/js/admin/src/addTagsPane.js
@@ -12,7 +12,7 @@ export default function() {
   extend(AdminNav.prototype, 'items', items => {
     items.add('tags', AdminLinkButton.component({
       href: app.route('tags'),
-      icon: 'tags',
+      icon: 'fa fa-tags',
       children: app.translator.trans('flarum-tags.admin.nav.tags_button'),
       description: app.translator.trans('flarum-tags.admin.nav.tags_text')
     }));
diff --git a/extensions/tags/js/admin/src/addTagsPermissionScope.js b/extensions/tags/js/admin/src/addTagsPermissionScope.js
index d88c266c1..e2b2e7cad 100644
--- a/extensions/tags/js/admin/src/addTagsPermissionScope.js
+++ b/extensions/tags/js/admin/src/addTagsPermissionScope.js
@@ -11,7 +11,7 @@ import sortTags from 'flarum/tags/utils/sortTags';
 export default function() {
   override(app, 'getRequiredPermissions', (original, permission) => {
     const tagPrefix = permission.match(/^tag\d+\./);
-    
+
     if (tagPrefix) {
       const globalPermission = permission.substr(tagPrefix[0].length);
 
@@ -19,7 +19,7 @@ export default function() {
 
       return required.map(required => tagPrefix[0] + required);
     }
-    
+
     return original(permission);
   });
 
@@ -52,7 +52,7 @@ export default function() {
         className: 'Dropdown--restrictByTag',
         buttonClassName: 'Button Button--text',
         label: app.translator.trans('flarum-tags.admin.permissions.restrict_by_tag_heading'),
-        icon: 'plus',
+        icon: 'fa fa-plus',
         caretIcon: null,
         children: tags.map(tag => Button.component({
           icon: true,
diff --git a/extensions/tags/js/admin/src/components/TagsPage.js b/extensions/tags/js/admin/src/components/TagsPage.js
index 1388a08dc..739d83c3b 100644
--- a/extensions/tags/js/admin/src/components/TagsPage.js
+++ b/extensions/tags/js/admin/src/components/TagsPage.js
@@ -14,7 +14,7 @@ function tagItem(tag) {
         <span className="TagListItem-name">{tag.name()}</span>
         {Button.component({
           className: 'Button Button--link',
-          icon: 'pencil',
+          icon: 'fa fa-pencil-alt',
           onclick: () => app.modal.show(new EditTagModal({tag}))
         })}
       </div>
@@ -40,7 +40,7 @@ export default class TagsPage extends Page {
             </p>
             {Button.component({
               className: 'Button Button--primary',
-              icon: 'plus',
+              icon: 'fa fa-plus',
               children: app.translator.trans('flarum-tags.admin.tags.create_tag_button'),
               onclick: () => app.modal.show(new EditTagModal())
             })}
diff --git a/extensions/tags/js/forum/src/addTagControl.js b/extensions/tags/js/forum/src/addTagControl.js
index 55f9cf86f..80e7ce900 100644
--- a/extensions/tags/js/forum/src/addTagControl.js
+++ b/extensions/tags/js/forum/src/addTagControl.js
@@ -10,7 +10,7 @@ export default function() {
     if (discussion.canTag()) {
       items.add('tags', Button.component({
         children: app.translator.trans('flarum-tags.forum.discussion_controls.edit_tags_button'),
-        icon: 'tag',
+        icon: 'fa fa-tag',
         onclick: () => app.modal.show(new TagDiscussionModal({discussion}))
       }));
     }
diff --git a/extensions/tags/js/forum/src/addTagList.js b/extensions/tags/js/forum/src/addTagList.js
index b1e553622..8f2e2b97d 100644
--- a/extensions/tags/js/forum/src/addTagList.js
+++ b/extensions/tags/js/forum/src/addTagList.js
@@ -12,7 +12,7 @@ export default function() {
   // to the index page's sidebar.
   extend(IndexPage.prototype, 'navItems', function(items) {
     items.add('tags', LinkButton.component({
-      icon: 'th-large',
+      icon: 'fa fa-th-large',
       children: app.translator.trans('flarum-tags.forum.index.tags_link'),
       href: app.route('tags')
     }), -10);
diff --git a/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js b/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js
index 42af9e1af..a858b8515 100644
--- a/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js
+++ b/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js
@@ -19,7 +19,7 @@ export default class DiscussionTaggedPost extends EventPost {
   }
 
   icon() {
-    return 'tag';
+    return 'fa fa-tag';
   }
 
   descriptionKey() {
diff --git a/extensions/tags/js/forum/src/components/TagDiscussionModal.js b/extensions/tags/js/forum/src/components/TagDiscussionModal.js
index f81948e8e..8ff4fe9f8 100644
--- a/extensions/tags/js/forum/src/components/TagDiscussionModal.js
+++ b/extensions/tags/js/forum/src/components/TagDiscussionModal.js
@@ -177,7 +177,7 @@ export default class TagDiscussionModal extends Modal {
               type: 'submit',
               className: 'Button Button--primary',
               disabled: primaryCount < this.minPrimary || secondaryCount < this.minSecondary,
-              icon: 'check',
+              icon: 'fa fa-check',
               children: app.translator.trans('flarum-tags.forum.choose_tags.submit_button')
             })}
           </div>
diff --git a/extensions/tags/js/forum/src/components/TagsPage.js b/extensions/tags/js/forum/src/components/TagsPage.js
index deacb7615..5ccb68fe6 100644
--- a/extensions/tags/js/forum/src/components/TagsPage.js
+++ b/extensions/tags/js/forum/src/components/TagsPage.js
@@ -12,7 +12,7 @@ export default class TagsPage extends Component {
     this.tags = sortTags(app.store.all('tags').filter(tag => !tag.parent()));
 
     app.current = this;
-    app.history.push('tags', icon('th-large'));
+    app.history.push('tags', icon('fa fa-th-large'));
     app.drawer.hide();
     app.modal.close();
   }