diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
index ce5a846e..e455589b 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
@@ -74,6 +74,8 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
         }
     }
     public var accessibilityTraits: UIAccessibilityTraits?
+    public var disabledAccessibilityTraits: UIAccessibilityTraits?
+    public var isAccessibilityElement: Bool?
     
     //--------------------------------------------------
     // MARK: - Methods
@@ -197,6 +199,8 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
         case disabledBorderColor
         case width
         case accessibilityTraits
+        case disabledAccessibilityTraits
+        case isAccessibilityElement
     }
     
     //--------------------------------------------------
@@ -266,6 +270,8 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         width = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .width)
         accessibilityTraits = try typeContainer.decodeIfPresent(UIAccessibilityTraits.self, forKey: .accessibilityTraits)
+        disabledAccessibilityTraits = try typeContainer.decodeIfPresent(UIAccessibilityTraits.self, forKey: .disabledAccessibilityTraits)
+        isAccessibilityElement = try typeContainer.decodeIfPresent(Bool.self, forKey: .isAccessibilityElement)
     }
     
     open func encode(to encoder: Encoder) throws {
@@ -290,5 +296,7 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
         try container.encodeIfPresent(groupName, forKey: .groupName)
         try container.encodeIfPresent(width, forKey: .width)
         try container.encodeIfPresent(accessibilityTraits, forKey: .accessibilityTraits)
+        try container.encodeIfPresent(disabledAccessibilityTraits, forKey: .disabledAccessibilityTraits)
+        try container.encodeIfPresent(isAccessibilityElement, forKey: .isAccessibilityElement)
     }
 }
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
index 74325d85..8f4bb522 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
@@ -60,7 +60,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
         image = try typeContainer.decodeIfPresent(ImageViewModel.self, forKey: .image)
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
         action = try typeContainer.decodeModel(codingKey: .action)
-        accessibilityTraits = try typeContainer.decodeIfPresent(UIAccessibilityTraits.self, forKey: .accessibilityTraits)
+        accessibilityTraits = try typeContainer.decodeIfPresent(UIAccessibilityTraits.self, forKey: .accessibilityTraits) ?? .button
         if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) {
             self.enabled = enabled
         }
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
index 71d5c332..f4b3e257 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
@@ -101,7 +101,7 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
         
         #if DEBUG
         // Useful to detect with isHittable when performing UI testing.
-        isAccessibilityElement = isEnabled
+        isAccessibilityElement = model?.isAccessibilityElement ?? isEnabled
         #endif
         
         if isEnabled {
@@ -134,6 +134,7 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
         case .standard:
             verticalPadding = Padding.Three
             horizontalPadding = Padding.Five
+            
             break
         case .small:
             verticalPadding = Padding.Two
@@ -173,9 +174,8 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
         }
         
         FormValidator.setupValidation(for: model, delegate: delegateObject?.formHolderDelegate)
-        if let traits = model.accessibilityTraits {
-            accessibilityTraits = traits
-        }
+        accessibilityTraits = isEnabled ? (model.accessibilityTraits ?? .button) : (model.disabledAccessibilityTraits ?? .none)
+
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject:  MVMCoreUIDelegateObject?) -> CGFloat? {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
index 2edda50e..2a2adb27 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
@@ -91,6 +91,6 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift
index e062fa53..d65e35e5 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift
@@ -99,7 +99,7 @@
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
         
         if !linkShowing {
             // Make whole cell focusable if no link.
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
index d050574c..70c8ea60 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
@@ -109,6 +109,6 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
index d133b035..cf119b33 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
@@ -87,7 +87,7 @@
 
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
         
         if !linkShowing {
             // Make whole cell focusable if no link.
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
index 1cad67b4..4a6667df 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
@@ -89,7 +89,7 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }
 
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
index d612ef48..ab8eee78 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
@@ -131,6 +131,6 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index bc715483..0fece30a 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -95,7 +95,7 @@ import Foundation
     // Ensures voice over does not read "selected" after user triggers action on cell.
     override public var accessibilityTraits: UIAccessibilityTraits {
         get {
-            return (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+            return listItemModel?.accessibilityTraits ?? .button
         }
         set {}
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift
index da77d173..e62ce891 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift
@@ -46,7 +46,7 @@ import Foundation
     /// Ensures voice over does not read "selected" after user triggers action on cell.
     override public var accessibilityTraits: UIAccessibilityTraits {
         get {
-            return (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+            return listItemModel?.accessibilityTraits ?? .button
         }
         set {}
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift
index 0c08b71b..cbd9741d 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift
@@ -91,6 +91,6 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
index 565b5c4d..eeb09ee5 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
@@ -83,6 +83,6 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
index e5de7b41..6ed847a9 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
@@ -100,7 +100,7 @@
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
         
         if !linkShowing {
             // Make whole cell focusable if no link.
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
index d7f90345..7fafd3f0 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
@@ -98,6 +98,6 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableRightCaretAlltextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableRightCaretAlltextAndLinks.swift
index 51fd0378..6b059dbc 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableRightCaretAlltextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableRightCaretAlltextAndLinks.swift
@@ -97,7 +97,7 @@
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
 
         if !linkShowing {
             // Make whole cell focusable if no link.
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
index 407eeacf..cd7a6db9 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
@@ -95,6 +95,6 @@
         }
         
         accessibilityLabel = message
-        accessibilityTraits = (accessoryView != nil) ? (listItemModel?.accessibilityTraits ?? .button) : .none
+        accessibilityTraits = listItemModel?.accessibilityTraits ?? .button
     }
 }