diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyText.swift
index 133b25ce..2d859582 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyText.swift
@@ -25,7 +25,6 @@ import Foundation
         headlineBody.stylePageHeader()
         addMolecule(headlineBody)
         isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //----------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2TinyButton.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2TinyButton.swift
index 5b6d2ea8..33317fe1 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2TinyButton.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2TinyButton.swift
@@ -49,9 +49,6 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         isAccessibilityElement = true
-        accessibilityHint = button.accessibilityHint
-        accessibilityTraits = button.accessibilityTraits
-        updateAccessibilityLabel()
     }
     
     //----------------------------------------------------
@@ -98,6 +95,8 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityHint = button.accessibilityHint
+        accessibilityTraits = button.accessibilityTraits
     }
     
     open override func accessibilityActivate() -> Bool {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
index b5da04e2..9c75f78c 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
@@ -13,6 +13,7 @@ import Foundation
     //-----------------------------------------------------
     // MARK: - Outlets
     //-----------------------------------------------------
+    
     public let eyebrow = Label(fontStyle: .RegularMicro)
     public let headline = Label(fontStyle: .BoldTitleMedium)
     public let body = Label(fontStyle: .RegularBodySmall)
@@ -113,7 +114,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageLabel = rightImage.accessibilityLabel {
+        if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
             message += rightImageLabel
         }
         
@@ -144,6 +145,10 @@ import Foundation
             views.append(twoLinkView.leftLink)
             views.append(twoLinkView.rightLink)
             
+            if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+                views.append(rightImage)
+            }
+            
             accessibilityElements = views
             return
             
@@ -156,7 +161,6 @@ import Foundation
             accessibilityHint = twoLinkView.rightLink.accessibilityHint
             accessibilityTraits = twoLinkView.rightLink.accessibilityTraits
             message += twoLinkView.rightLink.accessibilityLabel ?? ""
-            
         }
         
         isAccessibilityElement = true
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
index 4fc92e6e..6a469b0d 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
@@ -111,7 +111,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageLabel = rightImage.accessibilityLabel {
+        if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
             message += rightImageLabel
         }
         
@@ -142,6 +142,10 @@ import Foundation
             views.append(twoLinkView.leftLink)
             views.append(twoLinkView.rightLink)
             
+            if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+                views.append(rightImage)
+            }
+            
             accessibilityElements = views
             return
             
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
index 06d1173d..ff1c6e1b 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
@@ -88,19 +88,19 @@ import Foundation
         
         checkbox.updateAccessibilityLabel()
         
-        if let checkboxLabel = checkbox.accessibilityLabel {
+        if let checkboxLabel = checkbox.accessibilityLabel, !checkboxLabel.isEmpty {
             message += checkboxLabel + ", "
         }
         
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
+        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text, !eyebrowLabel.isEmpty {
             message += eyebrowLabel + ", "
         }
         
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
+        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text, !headlineLabel.isEmpty {
             message += headlineLabel + ", "
         }
         
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
+        if let bodyLabel = eyebrowHeadlineBodyLink.body.text, !bodyLabel.isEmpty {
             message += bodyLabel
         }
         
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index 7ce0c406..e67353c7 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -84,8 +84,8 @@ import Foundation
             message += headlineLabel + ", "
         }
         
-        if let headlineLabel = headline.text {
-            message += headlineLabel + ", "
+        if let subHeadlineLabel = subHeadline.text {
+            message += subHeadlineLabel + ", "
         }
         
         if let bodyLabel = body.text {