diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift
index 29159ddc..0bafed66 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift
@@ -87,27 +87,22 @@
     // MARK: - Accessibility
     //--------------------------------------------------
 
-    
     func getAccessibilityMessage() -> String? {
-        var message: String = ""
         
-        if let leftImageLabel = leftImage.imageView.accessibilityLabel {
-            message += leftImageLabel + ", "
-        }
-        if let rightLabel = rightLabel.text {
-            message += rightLabel
-        }
-        if let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() {
-            message += label
+        guard let rightLabel = rightLabel.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
         }
         
-        return message
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return rightLabel
+        }
+        
+        return rightLabel + ", " + label
     }
     
     func updateAccessibilityLabel() {
-
+        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        accessibilityTraits = .button
         
         if !linkShowing && accessoryView == nil {
             // Make whole cell focusable if one action
@@ -122,10 +117,10 @@
                 accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
                 elements.append(accessoryView)
             } else {
-                eyebrowHeadlineBodyLink.link.accessibilityLabel = eyebrowHeadlineBodyLink.link.titleLabel?.text
+                rightLabel.accessibilityLabel = getAccessibilityMessage()
             }
             
-            elements.append(link)
+            elements.append(rightLabel)
             
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
@@ -134,4 +129,5 @@
             accessibilityElements = elements
         }
     }
+    
 }