diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift
index 47db0732..9082aad5 100644
--- a/VDS/Components/Toggle/Toggle.swift
+++ b/VDS/Components/Toggle/Toggle.swift
@@ -183,7 +183,11 @@ open class Toggle: Control, Changeable, FormFieldable {
         super.setup()
         
         isAccessibilityElement = true
-        accessibilityTraits = .button
+        if #available(iOS 17.0, *) {
+            accessibilityTraits = .toggleButton
+        } else {
+            accessibilityTraits = .button
+        }
         addSubview(label)
         addSubview(toggleView)
                 
diff --git a/VDS/Components/Toggle/ToggleView.swift b/VDS/Components/Toggle/ToggleView.swift
index f4d257d5..b1aa030c 100644
--- a/VDS/Components/Toggle/ToggleView.swift
+++ b/VDS/Components/Toggle/ToggleView.swift
@@ -117,7 +117,11 @@ open class ToggleView: Control, Changeable, FormFieldable {
         super.setup()
 
         isAccessibilityElement = true
-        accessibilityTraits = .button
+        if #available(iOS 17.0, *) {
+            accessibilityTraits = .toggleButton
+        } else {
+            accessibilityTraits = .button
+        }
         
         addSubview(toggleView)
         toggleView.addSubview(knobView)