diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
index 0783ea99..5ce18f6e 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
@@ -132,7 +132,6 @@ import Foundation
         } else {
             // Make whole cell focusable if no action.
             isAccessibilityElement = true
-            accessibilityElements = nil
             if let message = getAccessibilityMessage(),
                 let buttonTitle = button.titleLabel?.text {
                 accessibilityLabel = message + ", " + buttonTitle
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
index 20433a45..25ae3714 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
@@ -132,7 +132,6 @@ import Foundation
         } else {
             // Make whole cell focusable if no action.
             isAccessibilityElement = true
-            accessibilityElements = nil
             if let message = getAccessibilityMessage(),
                 let buttonTitle = button.titleLabel?.text {
                 accessibilityLabel = message + ", " + buttonTitle
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
index 9e4d7533..2411a339 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
@@ -82,7 +82,6 @@ import Foundation
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else if let accessoryView = accessoryView {
             // Both caret and link. Read all content on caret.
             accessoryView.accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index ee97a369..979f8110 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -101,7 +101,6 @@ import Foundation
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else if let accessoryView = accessoryView {
             // Both caret and link. Read all content on caret.
             accessoryView.accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
index c08d37cd..f7042b56 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
@@ -86,16 +86,16 @@ import Foundation
     
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        isAccessibilityElement = !linkShowing
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         button.isAccessibilityElement = linkShowing
 
         if !linkShowing && accessoryView == nil {
             // Make whole cell focusable if one action
+            isAccessibilityElement = true
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else {
             // Make buttons focusable.
+            isAccessibilityElement = false
             var elements: [Any] = []
             if let accessoryView = accessoryView {
                 accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
@@ -106,7 +106,7 @@ import Foundation
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            elements.append(link)
+            elements.append(button)
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
index 76ce1a37..4f4180a0 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
@@ -107,7 +107,6 @@ import Foundation
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else if let accessoryView = accessoryView {
             // Both caret and link. Read all content on caret.
             accessoryView.accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
index d6714f60..7a4c4595 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
@@ -83,17 +83,17 @@ import Foundation
     
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        isAccessibilityElement = !linkShowing
         accessibilityTraits = .button
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         link.isAccessibilityElement = linkShowing
 
         if !linkShowing && accessoryView == nil {
             // Make whole cell focusable if one action
+            isAccessibilityElement = true
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else {
             // Make buttons focusable.
+            isAccessibilityElement = false
             var elements: [Any] = []
             if let accessoryView = accessoryView {
                 accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()