diff --git a/VDS/Components/Buttons/ButtonBase.swift b/VDS/Components/Buttons/ButtonBase.swift
index cc096d41..46f72c55 100644
--- a/VDS/Components/Buttons/ButtonBase.swift
+++ b/VDS/Components/Buttons/ButtonBase.swift
@@ -141,22 +141,13 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
         shouldUpdateView = true
         setNeedsUpdate()
     }
-        
-    //--------------------------------------------------
-    // MARK: - Overrides
-    //--------------------------------------------------
-    override open var intrinsicContentSize: CGSize {
-        let intrinsicContentSize = super.intrinsicContentSize
-        let adjustedWidth = intrinsicContentSize.width + titleEdgeInsets.left + titleEdgeInsets.right
-        let adjustedHeight = intrinsicContentSize.height + titleEdgeInsets.top + titleEdgeInsets.bottom
-        return CGSize(width: adjustedWidth, height: adjustedHeight)
-    }
-    
+            
     //--------------------------------------------------
     // MARK: - Private Methods
     //--------------------------------------------------
     private func updateLabel() {
-       
+        defer { invalidateIntrinsicContentSize() }
+        
         //clear the arrays holding actions
         accessibilityCustomActions = []
         if let text, !text.isEmpty {
diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift
index dcb4a46d..51221b34 100644
--- a/VDS/Components/Buttons/TextLink/TextLink.swift
+++ b/VDS/Components/Buttons/TextLink/TextLink.swift
@@ -75,7 +75,13 @@ open class TextLink: ButtonBase {
             
     /// The natural size for the receiving view, considering only properties of the view itself.
     open override var intrinsicContentSize: CGSize {
-        return titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize
+        guard let titleLabel else { return super.intrinsicContentSize }
+        // Calculate the titleLabel's intrinsic content size
+        let labelSize = titleLabel.sizeThatFits(CGSize(width: self.frame.width, height: CGFloat.greatestFiniteMagnitude))
+        // Adjust the size if needed (add any additional padding if your design requires)
+        let adjustedSize = CGSize(width: labelSize.width + contentEdgeInsets.left + contentEdgeInsets.right,
+                                  height: labelSize.height + contentEdgeInsets.top + contentEdgeInsets.bottom)
+        return adjustedSize
     }
     
     //--------------------------------------------------
@@ -87,6 +93,10 @@ open class TextLink: ButtonBase {
         isAccessibilityElement = true
         accessibilityTraits = .link
         
+        //left align titleLabel in case this is pinned leading/trailing
+        //default is always set to center
+        contentHorizontalAlignment = .left
+        
         if let titleLabel {
             addSubview(line)
             line.pinLeading(titleLabel.leadingAnchor)
diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
index aaa9f3cb..df276354 100644
--- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
+++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
@@ -79,6 +79,11 @@ open class TextLinkCaret: ButtonBase {
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     open override func setup() {
         super.setup()
+        
+        //left align titleLabel in case this is pinned leading/trailing
+        //default is always set to center
+        contentHorizontalAlignment = .left
+
         accessibilityTraits = .link
         titleLabel?.numberOfLines = 0
         titleLabel?.lineBreakMode = .byWordWrapping
@@ -98,10 +103,23 @@ open class TextLinkCaret: ButtonBase {
     }
     
     /// The natural size for the receiving view, considering only properties of the view itself.
-    override open var intrinsicContentSize: CGSize {
-        //get the labels size, if not the button
-        return titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize
+    open override var intrinsicContentSize: CGSize {
+        guard let titleLabel else { return super.intrinsicContentSize }
+        // Calculate the titleLabel's intrinsic content size
+        let labelSize = titleLabel.sizeThatFits(CGSize(width: self.frame.width - (contentEdgeInsets.left + contentEdgeInsets.right), height: CGFloat.greatestFiniteMagnitude))
+        // Adjust the size if needed (add any additional padding if your design requires)
+        let adjustedSize = CGSize(width: labelSize.width + contentEdgeInsets.left + contentEdgeInsets.right,
+                                  height: labelSize.height + contentEdgeInsets.top + contentEdgeInsets.bottom)
+        return adjustedSize
     }
+    
+    open override func layoutSubviews() {
+        super.layoutSubviews()
+        // This ensures the titleLabel is correctly positioned within the button
+        titleLabel?.preferredMaxLayoutWidth = self.frame.width - (contentEdgeInsets.left + contentEdgeInsets.right)
+        super.layoutSubviews() // Calling super again to ensure layout is updated with preferredMaxLayoutWidth
+    }
+
 }
 
 extension TextLinkCaret {