diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift
index bb47479d..886b1e8c 100644
--- a/VDS/Components/Checkbox/Checkbox.swift
+++ b/VDS/Components/Checkbox/Checkbox.swift
@@ -14,7 +14,7 @@ import VDSFormControlsTokens
 @objc(VDSCheckbox)
 open class Checkbox: SelectorBase {
 
-    open var isAnimated: Bool = true { didSet { setNeedsUpdate() }}
+    open var isAnimated: Bool = false { didSet { setNeedsUpdate() }}
 
     open override func setup() {
         super.setup()
@@ -24,10 +24,10 @@ open class Checkbox: SelectorBase {
         backgroundColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
         backgroundColorConfig.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: .error)
 
+        borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
+        borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted)
         borderColorConfig.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: .normal)
         borderColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
-        borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted)
-        borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
         borderColorConfig.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error)
 
         selectorColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight, forState: .selected)
@@ -36,6 +36,15 @@ open class Checkbox: SelectorBase {
         
     }
     
+    open override func toggle() {
+        //removed error
+        if showError && isSelected == false {
+            showError.toggle()
+        }
+        isSelected.toggle()
+        sendActions(for: .valueChanged)
+    }
+    
     open override func layoutSubviews() {
         super.layoutSubviews()