diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b8fea861..d367ba002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The format follows [Keep a Changelog] (https://keepachangelog.com/en/1.1.0/).
- **Required certificate tags have their own Settings tab and protect their fields** (#1734). The list moved from Advanced to a new Certificates tab; the layout and template screens list the configured tags instead of a fixed three. A field a required tag calls for is amber, badged, always required, and cannot be renamed or removed; a form missing one is warned on save.
- **Required form fields are a list of their own** (#1741). Settings → Certificates keeps the layout tags and, apart, the fields every form needs with label and type (default `name`, `cpf_rf`, `email`; Email stays). New forms start with them, their type is locked, and the editor adds missing ones.
- **Ordered three-level settings use the steps control** (#1745). The four geofence display modes, the two private-calendar displays and the IP API fallback store the same values as before; an unknown stored value shows the old default.
+- **The on/off toggle joins the control family** (#1748). `.ffc-toggle` is now `.ffc-control-toggle` everywhere, with the shared hover and pressed halo, a greyed disabled state instead of a faded one, and an optional check / cross mark on the knob.
### Fixed
@@ -36,6 +37,7 @@ The format follows [Keep a Changelog] (https://keepachangelog.com/en/1.1.0/).
- **Settings → Certificates saves the required tags one per line** (#1736). The Save button stored the list on a single line, which then read as one tag; a list already stored that way reads as separate tags again.
- **A certificate form submits again** (#1739). A script printed before `ffc-core.js` that created the `FFC` namespace made the core skip its own API, so every submit failed on `FFC.request is not a function`; the core now installs its API and keeps what was already there.
- **A quiz attempt that did not pass is no longer a certificate** (#1744). The first attempt was saved as issued and its certificate link emailed before its result was known; its code also verified. The email, verification by code or link, the REST lookup and the user dashboard now skip it.
+- **The dashboard's notification toggles can be reached by keyboard** (#1748). They used a second toggle that hid its checkbox with `display: none`; they now use the plugin's one toggle.
## [6.38.0] (2026-10-12) — `529e80a1`
diff --git a/CLAUDE.md b/CLAUDE.md
index 4b1e50c45..e661cacb3 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -807,7 +807,7 @@ A setting that picks among a few values is drawn by a control from the `ffc-cont
| 2 to 6 with no order | segmented | `AdminUI::render_segmented()` (planned) |
| anything else | a `
(input_class) because
// ffc-custom-fields-admin.js serialises each row via those selectors.
// Unique ids via the {{data.index}} mustache so cloned rows don't collide.
diff --git a/includes/core/class-ffc-icons.php b/includes/core/class-ffc-icons.php
index ff9251e67..9391f016d 100644
--- a/includes/core/class-ffc-icons.php
+++ b/includes/core/class-ffc-icons.php
@@ -414,6 +414,17 @@ public static function svg( string $name, int $size = 20 ): string {
);
}
+ /**
+ * Icons a component draws where no `.ffc-icon-*` class can reach -- a
+ * pseudo-element of another control, such as the toggle knob's mark
+ * (#1748). Each becomes a `--ffc-icon-mask-` custom property on
+ * `:root`, holding the same mask the class would use, so the drawing still
+ * has one source.
+ *
+ * @var array
+ */
+ public const MASKS = array( 'check', 'x' );
+
/**
* The CSS that draws every `.ffc-icon-*` class, between its markers.
*
@@ -473,7 +484,13 @@ public static function stylesheet(): string {
. " }\n"
. '}';
- return self::CSS_BEGIN . "\n" . $base . "\n\n" . implode( "\n\n", $rules ) . "\n\n" . self::tone_rules() . "\n\n" . $forced . "\n" . self::CSS_END;
+ $masks = array();
+ foreach ( self::MASKS as $icon ) {
+ $masks[] = ' --ffc-icon-mask-' . $icon . ': url("data:image/svg+xml,' . self::data_uri_body( $icon ) . '");';
+ }
+ $mask_vars = ":root {\n" . implode( "\n", $masks ) . "\n}";
+
+ return self::CSS_BEGIN . "\n" . $base . "\n\n" . implode( "\n\n", $rules ) . "\n\n" . $mask_vars . "\n\n" . self::tone_rules() . "\n\n" . $forced . "\n" . self::CSS_END;
}
/**
diff --git a/includes/recruitment/class-ffc-recruitment-admin-assets-manager.php b/includes/recruitment/class-ffc-recruitment-admin-assets-manager.php
index 12ff3aff7..8ab9a1af5 100644
--- a/includes/recruitment/class-ffc-recruitment-admin-assets-manager.php
+++ b/includes/recruitment/class-ffc-recruitment-admin-assets-manager.php
@@ -70,7 +70,7 @@ public static function maybe_enqueue( string $hook_suffix ): void {
$css_ver = file_exists( $css_path ) ? (string) filemtime( $css_path ) : FFC_VERSION;
$js_ver = file_exists( $js_path ) ? (string) filemtime( $js_path ) : FFC_VERSION;
- // ffc-common.css carries the .ffc-toggle switch styles used by the
+ // ffc-common.css carries the .ffc-control-toggle switch styles used by the
// notice/reason editors (render_toggle); load it as a dependency.
$s = \FreeFormCertificate\Core\AssetHelper::asset_suffix();
wp_enqueue_style(
diff --git a/includes/settings/tabs/class-ffc-tab-advanced.php b/includes/settings/tabs/class-ffc-tab-advanced.php
index ee0fcf0fb..e7141bc15 100644
--- a/includes/settings/tabs/class-ffc-tab-advanced.php
+++ b/includes/settings/tabs/class-ffc-tab-advanced.php
@@ -38,7 +38,7 @@ protected function init(): void {
/**
* Enqueue auto-save infrastructure when this tab is active. Powers
- * the `.ffc-toggle` switches for the activity-log master flag and
+ * the `.ffc-control-toggle` switches for the activity-log master flag and
* the per-module debug flags.
*
* @param string $hook Current admin page hook.
diff --git a/includes/settings/tabs/class-ffc-tab-cache.php b/includes/settings/tabs/class-ffc-tab-cache.php
index 4c8188d53..f6ed8e338 100644
--- a/includes/settings/tabs/class-ffc-tab-cache.php
+++ b/includes/settings/tabs/class-ffc-tab-cache.php
@@ -38,7 +38,7 @@ protected function init(): void {
/**
* Enqueue auto-save infrastructure when this tab is active so the
- * `.ffc-toggle` switches in the view persist inline via the
+ * `.ffc-control-toggle` switches in the view persist inline via the
* `ffc_update_setting` endpoint.
*
* @param string $hook Current admin page hook.
diff --git a/includes/settings/tabs/class-ffc-tab-ip-diagnostics.php b/includes/settings/tabs/class-ffc-tab-ip-diagnostics.php
index 8abe88517..f25abbd55 100644
--- a/includes/settings/tabs/class-ffc-tab-ip-diagnostics.php
+++ b/includes/settings/tabs/class-ffc-tab-ip-diagnostics.php
@@ -56,7 +56,7 @@ protected function init(): void {
/**
* Enqueue the auto-save infrastructure when this tab is active — powers the
- * `shadow_logging` `.ffc-toggle` switch.
+ * `shadow_logging` `.ffc-control-toggle` switch.
*
* @param string $hook Current admin page hook.
*/
@@ -631,7 +631,7 @@ private function render_config_form(): void {
echo '';
echo '';
- // Shadow logging — a `.ffc-toggle` with autosave (allowlisted key
+ // Shadow logging — a `.ffc-control-toggle` with autosave (allowlisted key
// `shadow_logging`). Kept a NAMED field in this form so the form Save
// also writes its current state: autosave + form-save stay consistent,
// never clobber (the settings-autosave invariant, see CLAUDE.md).
diff --git a/includes/settings/tabs/class-ffc-tab-modulos.php b/includes/settings/tabs/class-ffc-tab-modulos.php
index 42aed8e93..b17498d95 100644
--- a/includes/settings/tabs/class-ffc-tab-modulos.php
+++ b/includes/settings/tabs/class-ffc-tab-modulos.php
@@ -42,7 +42,7 @@ protected function init(): void {
}
/**
- * Enqueue the settings-autosave infra so the per-module `.ffc-toggle`
+ * Enqueue the settings-autosave infra so the per-module `.ffc-control-toggle`
* switches bind to the incremental settings AJAX endpoint.
*
* @param string $hook Current admin page hook.
diff --git a/includes/settings/tabs/class-ffc-tab-rate-limit.php b/includes/settings/tabs/class-ffc-tab-rate-limit.php
index 304986204..d87b625b4 100644
--- a/includes/settings/tabs/class-ffc-tab-rate-limit.php
+++ b/includes/settings/tabs/class-ffc-tab-rate-limit.php
@@ -37,7 +37,7 @@ protected function init(): void {
/**
* Enqueue auto-save infrastructure when this tab is active. Powers
- * the `.ffc-toggle` switches for the per-group feature flags
+ * the `.ffc-control-toggle` switches for the per-group feature flags
* (ip/email/cpf/global/device "enabled" + their satellites).
*
* @param string $hook Current admin page hook.
diff --git a/includes/settings/tabs/class-ffc-tab-smtp.php b/includes/settings/tabs/class-ffc-tab-smtp.php
index e801085cb..5a72dbba3 100644
--- a/includes/settings/tabs/class-ffc-tab-smtp.php
+++ b/includes/settings/tabs/class-ffc-tab-smtp.php
@@ -61,7 +61,7 @@ public function enqueue_scripts( string $hook ): void {
FFC_VERSION,
true
);
- // Powers the `.ffc-toggle` switch on `disable_all_emails`.
+ // Powers the `.ffc-control-toggle` switch on `disable_all_emails`.
$this->enqueue_autosave_infra();
}
diff --git a/includes/settings/tabs/class-ffc-tab-url-shortener.php b/includes/settings/tabs/class-ffc-tab-url-shortener.php
index de2765b81..c91681c88 100644
--- a/includes/settings/tabs/class-ffc-tab-url-shortener.php
+++ b/includes/settings/tabs/class-ffc-tab-url-shortener.php
@@ -35,7 +35,7 @@ protected function init(): void {
}
/**
- * Enqueue autosave infra so the two `.ffc-toggle` switches on this tab
+ * Enqueue autosave infra so the two `.ffc-control-toggle` switches on this tab
* (url_shortener_enabled / url_shortener_auto_create) bind to the
* incremental settings AJAX endpoint.
*
diff --git a/includes/settings/tabs/class-ffc-tab-user-access.php b/includes/settings/tabs/class-ffc-tab-user-access.php
index 61dd05968..ab0b6852f 100644
--- a/includes/settings/tabs/class-ffc-tab-user-access.php
+++ b/includes/settings/tabs/class-ffc-tab-user-access.php
@@ -37,7 +37,7 @@ protected function init(): void {
}
/**
- * Enqueue autosave infra so the three `.ffc-toggle` switches on this tab
+ * Enqueue autosave infra so the three `.ffc-control-toggle` switches on this tab
* (block_wp_admin / bypass_for_admins / allow_admin_bar) bind to the
* incremental settings AJAX endpoint via their `user_access_*` allowlist keys.
*
diff --git a/includes/settings/views/ffc-tab-smtp.php b/includes/settings/views/ffc-tab-smtp.php
index 7a9a57849..af316eafe 100644
--- a/includes/settings/views/ffc-tab-smtp.php
+++ b/includes/settings/views/ffc-tab-smtp.php
@@ -66,7 +66,7 @@
wrapper rather than