diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 75e9675a..c14e20fc 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -131,8 +131,31 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     private var widthConstraint: NSLayoutConstraint?
     
     private func constrainKnob() {
-        knobLeadingConstraint?.isActive = !isOn
-        knobTrailingConstraint?.isActive = isOn
+        
+        knobLeadingConstraint?.isActive = false
+        knobTrailingConstraint?.isActive = false
+        
+        if isOn {
+            constrainKnobOn()
+            
+        } else {
+            constrainKnobOff()
+        }
+        
+        knobTrailingConstraint?.isActive = true
+        knobLeadingConstraint?.isActive = true
+    }
+    
+    private func constrainKnobOn() {
+        
+        knobTrailingConstraint = trailingAnchor.constraint(equalTo: knobView.trailingAnchor, constant: 1)
+        knobLeadingConstraint = knobView.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor)
+    }
+    
+    private func constrainKnobOff() {
+        
+        knobTrailingConstraint = trailingAnchor.constraint(greaterThanOrEqualTo: knobView.trailingAnchor)
+        knobLeadingConstraint = knobView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 1)
     }
     
     //--------------------------------------------------
@@ -218,8 +241,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         knobView.topAnchor.constraint(greaterThanOrEqualTo: topAnchor).isActive = true
         bottomAnchor.constraint(greaterThanOrEqualTo: knobView.bottomAnchor).isActive = true
         
-        knobTrailingConstraint = trailingAnchor.constraint(equalTo: knobView.trailingAnchor, constant: 1)
-        knobLeadingConstraint = knobView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 1)
+        constrainKnobOff()
         knobLeadingConstraint?.isActive = true
     }