diff --git a/VDS/Components/BadgeIndicator/BadgeIndicator.swift b/VDS/Components/BadgeIndicator/BadgeIndicator.swift
index 25dd7a75..acf43519 100644
--- a/VDS/Components/BadgeIndicator/BadgeIndicator.swift
+++ b/VDS/Components/BadgeIndicator/BadgeIndicator.swift
@@ -258,19 +258,12 @@ open class BadgeIndicator: View {
         badgeView.addSubview(label)
         accessibilityElements = [label]
         
-        heightConstraint = badgeView.heightAnchor.constraint(greaterThanOrEqualToConstant: badgeSize)
-        heightConstraint?.isActive = true
-        
-        widthConstraint = badgeView.widthAnchor.constraint(greaterThanOrEqualToConstant: badgeSize)
-        widthConstraint?.isActive = true
+        heightConstraint = badgeView.heightGreaterThanEqualTo(constant: badgeSize)
+        widthConstraint = badgeView.widthGreaterThanEqualTo(constant: badgeSize)
     
         //we are insetting the padding to compensate for the border
-        NSLayoutConstraint.activate([
-            badgeView.topAnchor.constraint(equalTo: topAnchor, constant: borderWidth),
-            badgeView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -borderWidth),
-            badgeView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: borderWidth),
-            badgeView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -borderWidth)])
-
+        badgeView.pinToSuperView(.init(top: borderWidth, left: borderWidth, bottom: borderWidth, right: borderWidth))
+        
         labelContraints.topConstraint = label.pinTopGreaterThanOrEqualTo(anchor: badgeView.topAnchor)
         labelContraints.bottomConstraint = label.pinBottomGreaterThanOrEqualTo(anchor: badgeView.bottomAnchor)
         labelContraints.leadingConstraint = label.pinLeadingGreaterThanOrEqualTo(anchor: badgeView.leadingAnchor)
diff --git a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
index 00efaca1..f3e14b9f 100644
--- a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
+++ b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
@@ -235,22 +235,17 @@ open class ButtonIcon: Control {
         addSubview(icon)
         
         //determines the height/width of the icon
-        layoutGuideWidthConstraint = iconLayoutGuide.widthAnchor.constraint(equalToConstant: size.containerSize)
-        layoutGuideHeightConstraint = iconLayoutGuide.heightAnchor.constraint(equalToConstant: size.containerSize)
+        layoutGuideWidthConstraint = iconLayoutGuide.width(constant: size.containerSize)
+        layoutGuideHeightConstraint = iconLayoutGuide.height(constant: size.containerSize)
         
+        //pin layout guide
+        iconLayoutGuide.pinToOwningView()
+
         //determines the center point of the icon
         centerXConstraint = icon.centerXAnchor.constraint(equalTo: iconLayoutGuide.centerXAnchor, constant: 0)
+        centerXConstraint?.activate()
         centerYConstraint = icon.centerYAnchor.constraint(equalTo: iconLayoutGuide.centerYAnchor, constant: 0)
-        
-        //activate the constraints
-        NSLayoutConstraint.activate([layoutGuideWidthConstraint!,
-                                     layoutGuideHeightConstraint!,
-                                     centerXConstraint!,
-                                     centerYConstraint!,
-                                     iconLayoutGuide.topAnchor.constraint(equalTo: topAnchor),
-                                     iconLayoutGuide.bottomAnchor.constraint(equalTo: bottomAnchor),
-                                     iconLayoutGuide.leadingAnchor.constraint(equalTo: leadingAnchor),
-                                     iconLayoutGuide.trailingAnchor.constraint(equalTo: trailingAnchor)])
+        centerYConstraint?.activate()
     }
     
     /// Resets to default settings.