diff --git a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
index bf8a50f7..95406fb4 100644
--- a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
+++ b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
@@ -402,17 +402,15 @@ open class ButtonIcon: Control, Changeable {
         centerXConstraint?.activate()
         centerYConstraint = icon.centerYAnchor.constraint(equalTo: iconLayoutGuide.centerYAnchor, constant: 0)
         centerYConstraint?.activate()
-    }
-    
-    /// Executed on initialization for this View.
-    open override func initialSetup() {
-        super.initialSetup()
-        onClick = { control in
-            guard control.isEnabled else { return }
-            if control.selectedIconName != nil && control.selectable {
-                control.toggle()
-            }
-        }
+
+        publisher(for: .touchUpInside)
+            .sink(receiveValue: { [weak self] _ in
+                guard let self, isEnabled, 
+                        selectedIconName != nil,
+                        selectable else { return }
+                toggle()
+            })
+            .store(in: &subscribers)
     }
     
     /// This will change the state of the Selector and execute the actionBlock if provided.