diff --git a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
index 738881e3..37e50b08 100644
--- a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
+++ b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
@@ -432,6 +432,7 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
             icon.color = color
             icon.size = size.value
             icon.customSize = customSize
+            icon.isEnabled = isEnabled
         } else {
             icon.reset()
         }
@@ -502,7 +503,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
             badgeIndicator.isHidden = true
             return
         }
-        
         badgeIndicator.surface = surface
         badgeIndicator.kind = badgeIndicatorModel.kind
         badgeIndicator.fillColor = badgeIndicatorModel.fillColor
@@ -538,11 +538,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
         }
     }
     
-    /// Used to update any Accessibility properties.
-    open override func updateAccessibility() {
-        super.updateAccessibility()
-        setAccessibilityLabel(for: [icon, badgeIndicator.label])
-    }
 }
     
 // MARK: AppleGuidelinesTouchable