diff --git a/api_docs/deploying-bots.md b/api_docs/deploying-bots.md
index 6aff1f085c..03f6e33d55 100644
--- a/api_docs/deploying-bots.md
+++ b/api_docs/deploying-bots.md
@@ -89,7 +89,7 @@ pip3 install zulip_botserver
 1. Register new bot users on the Zulip server's web interface.
 
     * Log in to the Zulip server.
-    * Navigate to *Personal settings (<i class="fa fa-cog"></i>)* -> *Bots* -> *Add a new bot*.
+    * Navigate to *Personal settings (<i class="zulip-icon zulip-icon-gear"></i>)* -> *Bots* -> *Add a new bot*.
       Select *Outgoing webhook* for bot type, fill out the form (using
       the URL from above) and click on *Create bot*.
     * A new bot user should appear in the *Active bots* panel.
diff --git a/api_docs/outgoing-webhooks.md b/api_docs/outgoing-webhooks.md
index 55aaf29382..b4294ca8c1 100644
--- a/api_docs/outgoing-webhooks.md
+++ b/api_docs/outgoing-webhooks.md
@@ -18,7 +18,7 @@ with porting an existing Slack integration to work with Zulip.
 To register an outgoing webhook:
 
 * Log in to the Zulip server.
-* Navigate to *Personal settings (<i class="fa fa-cog"></i>)* -> *Bots* ->
+* Navigate to *Personal settings (<i class="zulip-icon zulip-icon-gear"></i>)* -> *Bots* ->
   *Add a new bot*.  Select *Outgoing webhook* for bot type, the URL
   you'd like Zulip to post to as the **Endpoint URL**, the format you
   want, and click on *Create bot*. to submit the form/
diff --git a/help/include/invite-users.md b/help/include/invite-users.md
index fb26832a43..94a003e640 100644
--- a/help/include/invite-users.md
+++ b/help/include/invite-users.md
@@ -1,4 +1,4 @@
-1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper
+1. Click on the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper
    right corner of the web or desktop app.
 
 1. Select <i class="fa fa-user-plus"></i> **Invite users**.
diff --git a/help/logging-in.md b/help/logging-in.md
index d4fc12c9fa..65e398d8d5 100644
--- a/help/logging-in.md
+++ b/help/logging-in.md
@@ -56,7 +56,7 @@ Here are some ways to find the URL for your Zulip organization.
 * On [Zulip Cloud](https://zulip.com/plans/) and other Zulip servers updated to
   [Zulip 6.0 or
   higher](https://zulip.readthedocs.io/en/stable/overview/changelog.html#zulip-6-x-series),
-  click the **gear** (<i class="fa fa-cog"></i>) icon in the upper right
+  click the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper right
   corner of the web or desktop app. Your organization's log in URL is shown in the top
   section of the menu.
 
diff --git a/help/logging-out.md b/help/logging-out.md
index 95cea98ad0..f39d278c66 100644
--- a/help/logging-out.md
+++ b/help/logging-out.md
@@ -3,7 +3,7 @@
 {start_tabs}
 {tab|desktop-web}
 
-1. Click the **gear** (<i class="fa fa-cog"></i>) icon in the top
+1. Click the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the top
 right corner of the app.
 
 1. Click **Log out**.
diff --git a/help/view-zulip-version.md b/help/view-zulip-version.md
index b8fc6204fd..909e5fb8a3 100644
--- a/help/view-zulip-version.md
+++ b/help/view-zulip-version.md
@@ -19,7 +19,7 @@ Zulip Cloud organizations are always updated to the latest version of Zulip.
 
 {tab|v6}
 
-1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper
+1. Click on the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper
    right corner of the web or desktop app.
 
 1. View the version number or Zulip Cloud plan in the top section of the menu.
diff --git a/zerver/lib/markdown/help_settings_links.py b/zerver/lib/markdown/help_settings_links.py
index 496e3df238..c6736cb3ca 100644
--- a/zerver/lib/markdown/help_settings_links.py
+++ b/zerver/lib/markdown/help_settings_links.py
@@ -102,7 +102,7 @@ link_mapping = {
 }
 
 settings_markdown = """
-1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper
+1. Click on the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper
    right corner of the web or desktop app.
 
 1. Select **{setting_type_name}**.