diff --git a/static/styles/settings.scss b/static/styles/settings.scss
index 9f85c63902..241c687095 100644
--- a/static/styles/settings.scss
+++ b/static/styles/settings.scss
@@ -105,15 +105,6 @@ label {
     margin-bottom: 10px;
 }
 
-.upgrade_realm_plan_type_suggestion {
-    font-size: 16px;
-}
-
-.upgrade_realm_plan_type_suggestion::after {
-    font-family: FontAwesome;
-    content: "\f135";
-}
-
 .user-avatar-section {
     float: right;
 }
@@ -312,6 +303,7 @@ td .button {
     margin-right: 5px;
 }
 
+.settings-section .upgrade-tip,
 .settings-section .tip {
     position: relative;
     display: block;
@@ -325,9 +317,8 @@ td .button {
     color: hsl(0, 0%, 40%);
 }
 
+.settings-section .upgrade-tip::before,
 .settings-section .tip::before {
-    content: "\f0a2";
-
     display: inline;
     margin-right: 8px;
 
@@ -335,6 +326,22 @@ td .button {
     font-weight: 600;
 }
 
+.settings-section .upgrade-tip::before {
+    content: "\f135";
+}
+
+.settings-section .upgrade-tip:hover {
+    color: hsl(0, 0%, 20%);
+    border: 1px solid hsl(49, 20%, 60%);
+    box-shadow: 0px 0px 4px hsla(199, 79%, 56%, .2);
+
+    text-decoration: none;
+}
+
+.settings-section .tip::before {
+    content: "\f0a2";
+}
+
 .dynamic-input {
     display: inline-block;
     padding: 5px;
diff --git a/static/templates/settings/organization_profile_admin.hbs b/static/templates/settings/organization_profile_admin.hbs
index cb2bc629bf..86a11c2367 100644
--- a/static/templates/settings/organization_profile_admin.hbs
+++ b/static/templates/settings/organization_profile_admin.hbs
@@ -58,11 +58,9 @@
             </h3>
             <div>
                 {{#unless plan_includes_wide_organization_logo}}
-                <p class="upgrade_realm_plan_type_suggestion">
-                    <a href="https://zulipchat.com/plans/" target="_blank">
-                        {{upgrade_text_for_wide_organization_logo}}
-                    </a>
-                </p>
+                <a href="/upgrade" class="upgrade-tip" target="_blank">
+                    {{upgrade_text_for_wide_organization_logo}}
+                </a>
                 {{/unless}}
             </div>
         </div>
diff --git a/tools/lib/capitalization.py b/tools/lib/capitalization.py
index 172e735e41..0e5f87ff2d 100644
--- a/tools/lib/capitalization.py
+++ b/tools/lib/capitalization.py
@@ -59,6 +59,7 @@ IGNORED_PHRASES = [
     r"Zulip",
     r"Zulip Account Security",
     r"Zulip Security",
+    r"Zulip Standard",
     r"Zulip Team",
     r"iPhone",
     r"iOS",
diff --git a/zerver/models.py b/zerver/models.py
index 2545e52ba5..51c5f315a3 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -270,6 +270,7 @@ class Realm(models.Model):
     COMMUNITY = 2
     org_type = models.PositiveSmallIntegerField(default=CORPORATE)  # type: int
 
+    UPGRADE_TEXT_STANDARD = _("Available on Zulip Standard. Upgrade to access.")
     # plan_type controls various features around resource/feature
     # limitations for a Zulip organization on multi-tenant servers
     # like zulipchat.com.
@@ -277,7 +278,6 @@ class Realm(models.Model):
     LIMITED = 2
     STANDARD = 3
     STANDARD_FREE = 4
-    UPGRADE_TEXT_STANDARD = _("Available on all paid plans. Upgrade ")
     plan_type = models.PositiveSmallIntegerField(default=SELF_HOSTED)  # type: int
 
     # This value is also being used in static/js/settings_bots.bot_creation_policy_values.