diff --git a/src/components/DarkModeToggle.tsx b/src/components/DarkModeToggle.tsx
index 13495bf9..2cf7df07 100644
--- a/src/components/DarkModeToggle.tsx
+++ b/src/components/DarkModeToggle.tsx
@@ -14,7 +14,9 @@ export const DarkModeToggle = (props: {
   return (
     <label
       className={`ToolIcon ToolIcon_type_floating ToolIcon_size_M`}
-      title={t("buttons.toggleDarkMode")}
+      title={
+        props.value === "dark" ? t("buttons.lightMode") : t("buttons.darkMode")
+      }
     >
       <input
         className="ToolIcon_type_checkbox ToolIcon_toggle_opaque"
@@ -23,7 +25,11 @@ export const DarkModeToggle = (props: {
           props.onChange(event.target.checked ? "dark" : "light")
         }
         checked={props.value === "dark"}
-        aria-label={t("buttons.toggleDarkMode")}
+        aria-label={
+          props.value === "dark"
+            ? t("buttons.lightMode")
+            : t("buttons.darkMode")
+        }
       />
       <div className="ToolIcon__icon">
         {props.value === "light" ? ICONS.MOON : ICONS.SUN}
diff --git a/src/components/ShortcutsDialog.tsx b/src/components/ShortcutsDialog.tsx
index 7c878414..2e58a1ea 100644
--- a/src/components/ShortcutsDialog.tsx
+++ b/src/components/ShortcutsDialog.tsx
@@ -210,12 +210,9 @@ export const ShortcutsDialog = ({ onClose }: { onClose?: () => void }) => {
                 label={t("shortcutsDialog.zoomToSelection")}
                 shortcuts={["Shift+2"]}
               />
+              <Shortcut label={t("buttons.fullScreen")} shortcuts={["F"]} />
               <Shortcut
-                label={t("buttons.toggleFullScreen")}
-                shortcuts={["F"]}
-              />
-              <Shortcut
-                label={t("buttons.toggleZenMode")}
+                label={t("buttons.zenMode")}
                 shortcuts={[getShortcutKey("Alt+Z")]}
               />
               <Shortcut
diff --git a/src/locales/en.json b/src/locales/en.json
index 36b45e0f..682e7f42 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -118,9 +118,10 @@
     "redo": "Redo",
     "roomDialog": "Start live collaboration",
     "createNewRoom": "Create new room",
-    "toggleFullScreen": "Toggle full screen",
-    "toggleDarkMode": "Toggle dark mode",
-    "toggleZenMode": "Toggle zen mode",
+    "fullScreen": "Full screen",
+    "darkMode": "Dark mode",
+    "lightMode": "Light mode",
+    "zenMode": "Zen mode",
     "exitZenMode": "Exit zen mode"
   },
   "alerts": {