diff --git a/static/js/settings_config.ts b/static/js/settings_config.ts
index 0fb5a2de36..1ed962459a 100644
--- a/static/js/settings_config.ts
+++ b/static/js/settings_config.ts
@@ -52,7 +52,7 @@ export const color_scheme_values = {
     },
     night: {
         code: 2,
-        description: $t({defaultMessage: "Night mode"}),
+        description: $t({defaultMessage: "Dark theme"}),
     },
     day: {
         code: 3,
diff --git a/templates/zerver/help/dark-theme.md b/templates/zerver/help/dark-theme.md
index e8163c9787..4915fb230a 100644
--- a/templates/zerver/help/dark-theme.md
+++ b/templates/zerver/help/dark-theme.md
@@ -1,4 +1,4 @@
-# Night mode
+# Dark theme
 
 Zulip provides both a light theme and a night theme, which is great
 for working in a dark space.
@@ -16,6 +16,6 @@ for working in a dark space.
 The default is **Sync with computer**, which detects which theme to use based
 on the color scheme used by your operating system.
 
-You can also specify **Night mode** or **Day mode** if you'd like
+You can also specify **Dark theme** or **Day mode** if you'd like
 Zulip to use the same color scheme regardless of your operating system
 configuration.
diff --git a/templates/zerver/help/include/set-up-your-account.md b/templates/zerver/help/include/set-up-your-account.md
index 1093a23f3c..8772d005cf 100644
--- a/templates/zerver/help/include/set-up-your-account.md
+++ b/templates/zerver/help/include/set-up-your-account.md
@@ -7,7 +7,7 @@
   [edit your profile information](https://zulip.com/help/edit-your-profile) to tell others
   about yourself.
 - [Review your display settings](/help/review-your-settings#review-your-display-settings).
-  You can [switch between day and night mode](/help/dark-theme),
+  You can [switch between day and dark theme](/help/dark-theme),
   [pick your favorite emoji theme](/help/emoji-and-emoticons#change-your-emoji-set),
   [change your language](/help/change-your-language), and make other tweaks to your Zulip experience.
 - [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams).
diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index cb10345a1a..08df9590cf 100644
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -44,7 +44,7 @@
 
 ## Display settings
 * [Review your settings](/help/review-your-settings)
-* [Night mode](/help/dark-theme)
+* [Dark theme](/help/dark-theme)
 * [Change your language](/help/change-your-language)
 * [Change your timezone](/help/change-your-timezone)
 * [Use 24-hour time](/help/change-the-time-format)
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index d29294d15f..ba892240d2 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -7538,7 +7538,7 @@ paths:
             Controls which [color theme](/help/dark-theme) to use.
 
             - 1 - Automatic
-            - 2 - Night mode
+            - 2 - Dark theme
             - 3 - Day mode
 
             Automatic detection is implementing using the standard `prefers-color-scheme`
@@ -9477,7 +9477,7 @@ paths:
                               Controls which [color theme](/help/dark-theme) to use.
 
                               - 1 - Automatic
-                              - 2 - Night mode
+                              - 2 - Dark theme
                               - 3 - Day mode
 
                               Automatic detection is implementing using the standard `prefers-color-scheme`
@@ -11185,7 +11185,7 @@ paths:
                               Controls which [color theme](/help/dark-theme) to use.
 
                               - 1 - Automatic
-                              - 2 - Night mode
+                              - 2 - Dark theme
                               - 3 - Day mode
 
                               Automatic detection is implementing using the standard `prefers-color-scheme`
@@ -12082,7 +12082,7 @@ paths:
             Controls which [color theme](/help/dark-theme) to use.
 
             - 1 - Automatic
-            - 2 - Night mode
+            - 2 - Dark theme
             - 3 - Day mode
 
             Automatic detection is implementing using the standard `prefers-color-scheme`