diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 956c2afc..5018c42b 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -62,7 +62,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         didSet {
             isUserInteractionEnabled = isEnabled
             changeStateNoAnimation(isEnabled ? isOn : false)
-            backgroundColor = isEnabled ? containerTintColor?.off : disabledTintColor?.container
+            backgroundColor = isEnabled ? isOn ? containerTintColor?.on : containerTintColor?.off : disabledTintColor?.container
             knobView.backgroundColor = isEnabled ? knobTintColor?.off : disabledTintColor?.knob
         }
     }