diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 2e50dfca..02373958 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -44,8 +44,8 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     }()
     
     // Sizes are from InVision design specs.
-    static let containerSize = CGSize(width: 46, height: 24)
-    static let knobSize = CGSize(width: 22, height: 22)
+    static let containerSize = CGSize(width: 51, height: 31)
+    static let knobSize = CGSize(width: 28, height: 28)
     
     private var knobView: View = {
         let view = View()
@@ -142,14 +142,14 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     
     private func constrainKnobOn() {
         
-        knobTrailingConstraint = trailingAnchor.constraint(equalTo: knobView.trailingAnchor, constant: 1)
+        knobTrailingConstraint = trailingAnchor.constraint(equalTo: knobView.trailingAnchor, constant: 2)
         knobLeadingConstraint = knobView.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor)
     }
     
     private func constrainKnobOff() {
         
         knobTrailingConstraint = trailingAnchor.constraint(greaterThanOrEqualTo: knobView.trailingAnchor)
-        knobLeadingConstraint = knobView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 1)
+        knobLeadingConstraint = knobView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 2)
     }
     
     //--------------------------------------------------
@@ -223,7 +223,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         widthConstraint = widthAnchor.constraint(equalToConstant: Self.containerSize.width)
         widthConstraint?.isActive = true
         
-        layer.cornerRadius = Self.containerSize.height / 2.0
+        layer.cornerRadius = Self.getContainerHeight() / 2.0
         backgroundColor = containerTintColor.off
         
         addSubview(knobView)