diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index afff5156e..3fcab483b 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -104,6 +104,7 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                     style: .bordered,
                     title: "DISAPPERING_MESSAGES_SAVE_TITLE".localized(),
                     isEnabled: true,
+                    accessibilityIdentifier: "Set button",
                     minWidth: 110,
                     onTap: {
                         self?.saveChanges()
@@ -193,6 +194,8 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                                                 }
                                             ),
                                             isEnabled: DisappearingMessagesConfiguration.isNewConfigurationEnabled,
+                                            accessibilityIdentifier: "Disappear after read option",
+                                            accessibilityLabel: "Disappear after read option",
                                             onTap: {
                                                 let updatedConfig: DisappearingMessagesConfiguration = currentSelection
                                                     .with(
@@ -218,6 +221,8 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                                                 }
                                             ),
                                             isEnabled: DisappearingMessagesConfiguration.isNewConfigurationEnabled,
+                                            accessibilityIdentifier: "Disappear after send option",
+                                            accessibilityLabel: "Disappear after send option",
                                             onTap: {
                                                 let updatedConfig: DisappearingMessagesConfiguration = currentSelection
                                                     .with(
diff --git a/Session/Conversations/Views & Modals/ConversationTitleView.swift b/Session/Conversations/Views & Modals/ConversationTitleView.swift
index 30e0fce17..974ba6b08 100644
--- a/Session/Conversations/Views & Modals/ConversationTitleView.swift	
+++ b/Session/Conversations/Views & Modals/ConversationTitleView.swift	
@@ -28,7 +28,7 @@ final class ConversationTitleView: UIView {
     
     private lazy var titleLabel: UILabel = {
         let result: UILabel = UILabel()
-        result.accessibilityIdentifier = "Username"
+        result.accessibilityIdentifier = "Conversation header name"
         result.isAccessibilityElement = true
         result.font = .boldSystemFont(ofSize: Values.mediumFontSize)
         result.themeTextColor = .textPrimary
@@ -158,7 +158,7 @@ final class ConversationTitleView: UIView {
                 labelInfos.append(
                     SessionLabelCarouselView.LabelInfo(
                         attributedText: notificationSettingsLabelString,
-                        accessibilityId: nil,
+                        accessibilityIdentifier: nil,
                         type: .notificationSettings
                     )
                 )
@@ -179,7 +179,7 @@ final class ConversationTitleView: UIView {
                 labelInfos.append(
                     SessionLabelCarouselView.LabelInfo(
                         attributedText: notificationSettingsLabelString,
-                        accessibilityId: nil,
+                        accessibilityIdentifier: nil,
                         type: .notificationSettings
                     )
                 )
@@ -205,7 +205,7 @@ final class ConversationTitleView: UIView {
                 labelInfos.append(
                     SessionLabelCarouselView.LabelInfo(
                         attributedText: userCountLabelString,
-                        accessibilityId: nil,
+                        accessibilityIdentifier: nil,
                         type: .userCount
                     )
                 )
@@ -241,7 +241,7 @@ final class ConversationTitleView: UIView {
                 labelInfos.append(
                     SessionLabelCarouselView.LabelInfo(
                         attributedText: disappearingMessageSettingLabelString,
-                        accessibilityId: "Disappearing messages type and time",
+                        accessibilityIdentifier: "Disappearing messages type and time",
                         type: .disappearingMessageSetting
                     )
                 )
diff --git a/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift b/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift
index 63f41c662..fb4f0f213 100644
--- a/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift	
+++ b/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift	
@@ -23,7 +23,7 @@ final class SessionLabelCarouselView: UIView, UIScrollViewDelegate {
     
     public struct LabelInfo {
         let attributedText: NSAttributedString
-        let accessibilityId: String?
+        let accessibilityIdentifier: String?
         let type: LabelType
     }
     
@@ -139,7 +139,7 @@ final class SessionLabelCarouselView: UIView, UIScrollViewDelegate {
             label.themeTextColor = .textPrimary
             label.lineBreakMode = .byTruncatingTail
             label.attributedText = $0.attributedText
-            label.accessibilityIdentifier = $0.accessibilityId
+            label.accessibilityIdentifier = $0.accessibilityIdentifier
             label.isAccessibilityElement = true
             wrapper.addSubview(label)
             label.center(in: wrapper)
diff --git a/Session/Shared/SessionTableViewController.swift b/Session/Shared/SessionTableViewController.swift
index de6b417f7..d79565fdd 100644
--- a/Session/Shared/SessionTableViewController.swift
+++ b/Session/Shared/SessionTableViewController.swift
@@ -299,6 +299,8 @@ class SessionTableViewController<NavItemId: Equatable, Section: SessionTableSect
                     self?.footerButton.setStyle(buttonInfo.style)
                     self?.footerButton.isEnabled = buttonInfo.isEnabled
                     self?.footerButton.set(.width, greaterThanOrEqualTo: buttonInfo.minWidth)
+                    self?.footerButton.accessibilityIdentifier = buttonInfo.accessibilityIdentifier
+                    self?.footerButton.accessibilityLabel = buttonInfo.accessibilityLabel
                 }
                 
                 self?.onFooterTap = buttonInfo?.onTap
diff --git a/SessionUIKit/Components/SessionButton.swift b/SessionUIKit/Components/SessionButton.swift
index fd1c63fd2..f92d2dda3 100644
--- a/SessionUIKit/Components/SessionButton.swift
+++ b/SessionUIKit/Components/SessionButton.swift
@@ -21,6 +21,8 @@ public final class SessionButton: UIButton {
         public let style: Style
         public let title: String
         public let isEnabled: Bool
+        public let accessibilityIdentifier: String?
+        public let accessibilityLabel: String?
         public let minWidth: CGFloat
         public let onTap: () -> ()
         
@@ -28,12 +30,16 @@ public final class SessionButton: UIButton {
             style: Style,
             title: String,
             isEnabled: Bool,
+            accessibilityIdentifier: String? = nil,
+            accessibilityLabel: String? = nil,
             minWidth: CGFloat = 0,
             onTap: @escaping () -> ()
         ) {
             self.style = style
             self.title = title
             self.isEnabled = isEnabled
+            self.accessibilityIdentifier = accessibilityIdentifier
+            self.accessibilityLabel = accessibilityLabel
             self.onTap = onTap
             self.minWidth = minWidth
         }