diff --git a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
index ea85c66b2..ca157a055 100644
--- a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
@@ -157,7 +157,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "App Store Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableUBSanitizer = "YES"
diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index 83cbbb45a..7fe20ec66 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -1806,7 +1806,11 @@ extension ConversationVC:
                 }
                 
                 let actionSheet: UIAlertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-                actionSheet.addAction(UIAlertAction(title: "delete_message_for_me".localized(), style: .destructive) { [weak self] _ in
+                actionSheet.addAction(UIAlertAction(
+                    title: "delete_message_for_me".localized(),
+                    accessibilityIdentifier: "Delete for me",
+                    style: .destructive
+                ) { [weak self] _ in
                     Storage.shared.writeAsync { db in
                         _ = try Interaction
                             .filter(id: cellViewModel.id)
@@ -1829,6 +1833,7 @@ extension ConversationVC:
                         "delete_message_for_everyone".localized() :
                         String(format: "delete_message_for_me_and_recipient".localized(), threadName)
                     ),
+                    accessibilityIdentifier: "Delete for everyone",
                     style: .destructive
                 ) { [weak self] _ in
                     deleteRemotely(
diff --git a/Session/Conversations/Input View/ExpandingAttachmentsButton.swift b/Session/Conversations/Input View/ExpandingAttachmentsButton.swift
index cff2fda71..a69c823bc 100644
--- a/Session/Conversations/Input View/ExpandingAttachmentsButton.swift	
+++ b/Session/Conversations/Input View/ExpandingAttachmentsButton.swift	
@@ -26,28 +26,28 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
     // MARK: UI Components
     lazy var gifButton: InputViewButton = {
         let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_gif_black"), delegate: self, hasOpaqueBackground: true)
-        result.accessibilityLabel = "GIF button"
+        result.accessibilityIdentifier = "GIF button"
         
         return result
     }()
     lazy var gifButtonContainer = container(for: gifButton)
     lazy var documentButton: InputViewButton = {
         let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_document_black"), delegate: self, hasOpaqueBackground: true)
-        result.accessibilityLabel = "Documents folder"
+        result.accessibilityIdentifier = "Documents folder"
         
         return result
     }()
     lazy var documentButtonContainer = container(for: documentButton)
     lazy var libraryButton: InputViewButton = {
         let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_roll_black"), delegate: self, hasOpaqueBackground: true)
-        result.accessibilityLabel = "Images folder"
+        result.accessibilityIdentifier = "Images folder"
         
         return result
     }()
     lazy var libraryButtonContainer = container(for: libraryButton)
     lazy var cameraButton: InputViewButton = {
         let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_black"), delegate: self, hasOpaqueBackground: true)
-        result.accessibilityLabel = "Select camera button"
+        result.accessibilityIdentifier = "Select camera button"
         
         return result
     }()
diff --git a/Session/Conversations/Input View/InputView.swift b/Session/Conversations/Input View/InputView.swift
index b1b40c892..5b472eed5 100644
--- a/Session/Conversations/Input View/InputView.swift	
+++ b/Session/Conversations/Input View/InputView.swift	
@@ -53,6 +53,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
     private lazy var attachmentsButton: ExpandingAttachmentsButton = {
         let result = ExpandingAttachmentsButton(delegate: delegate)
         result.accessibilityLabel = "Attachments button"
+        result.accessibilityIdentifier = "Attachments button"
         result.isAccessibilityElement = true
         
         return result
@@ -61,6 +62,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
     private lazy var voiceMessageButton: InputViewButton = {
         let result = InputViewButton(icon: #imageLiteral(resourceName: "Microphone"), delegate: self)
         result.accessibilityLabel = "New voice message"
+        result.accessibilityIdentifier = "New voice message"
         result.isAccessibilityElement = true
         
         return result
@@ -69,6 +71,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
     private lazy var sendButton: InputViewButton = {
         let result = InputViewButton(icon: #imageLiteral(resourceName: "ArrowUp"), isSendButton: true, delegate: self)
         result.isHidden = true
+        result.accessibilityIdentifier = "Send message button"
         result.accessibilityLabel = "Send message button"
         result.isAccessibilityElement = true
         
@@ -86,6 +89,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
     private lazy var mentionsViewContainer: UIView = {
         let result: UIView = UIView()
         result.accessibilityLabel = "Mentions list"
+        result.accessibilityIdentifier = "Mentions list"
         result.isAccessibilityElement = true
         result.alpha = 0
         
@@ -118,6 +122,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
         let maxWidth = UIScreen.main.bounds.width - 2 * InputViewButton.expandedSize - 2 * Values.smallSpacing - 2 * (Values.mediumSpacing - adjustment)
         let result = InputTextView(delegate: self, maxWidth: maxWidth)
         result.accessibilityLabel = "Message input box"
+        result.accessibilityIdentifier = "Message input box"
         result.isAccessibilityElement = true
         
         return result
diff --git a/Session/Conversations/Message Cells/Content Views/DeletedMessageView.swift b/Session/Conversations/Message Cells/Content Views/DeletedMessageView.swift
index dd7d01d48..6d1882ecc 100644
--- a/Session/Conversations/Message Cells/Content Views/DeletedMessageView.swift	
+++ b/Session/Conversations/Message Cells/Content Views/DeletedMessageView.swift	
@@ -13,7 +13,8 @@ final class DeletedMessageView: UIView {
     
     init(textColor: ThemeValue) {
         super.init(frame: CGRect.zero)
-        
+        accessibilityIdentifier = "Deleted message"
+        isAccessibilityElement = true
         setUpViewHierarchy(textColor: textColor)
     }
     
diff --git a/Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift b/Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift
index 754ded084..56eb87aef 100644
--- a/Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift	
+++ b/Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift	
@@ -12,7 +12,8 @@ final class MediaPlaceholderView: UIView {
     
     init(cellViewModel: MessageViewModel, textColor: ThemeValue) {
         super.init(frame: CGRect.zero)
-        self.accessibilityLabel = "Untrusted attachment message"
+        self.accessibilityIdentifier = "Untrusted attachment message"
+        self.isAccessibilityElement = true
         setUpViewHierarchy(cellViewModel: cellViewModel, textColor: textColor)
     }
     
diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift
index 45145bb22..d3c62390d 100644
--- a/Session/Conversations/Message Cells/VisibleMessageCell.swift	
+++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift	
@@ -435,6 +435,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
             subview.removeFromSuperview()
         }
         albumView = nil
+        albumView = nil
         bodyTappableLabel = nil
         
         // Handle the deleted state first (it's much simpler than the others)
diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
index bc410492b..a330b928e 100644
--- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
@@ -678,9 +678,9 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
                                 nil
                             ),
                             accessibilityLabel: oldBlockedState == false ? "User blocked" : "Confirm unblock",
-                            accessibilityId: "OK",
+                            accessibilityId: "Test_name",
                             cancelTitle: "BUTTON_OK".localized(),
-                            cancelAccessibilityLabel: "OK",
+                            cancelAccessibilityLabel: "OK_BUTTON",
                             cancelStyle: .alert_text
                         )
                     )
diff --git a/SessionUIKit/Components/ConfirmationModal.swift b/SessionUIKit/Components/ConfirmationModal.swift
index d98dd9f5f..2ffe5947a 100644
--- a/SessionUIKit/Components/ConfirmationModal.swift
+++ b/SessionUIKit/Components/ConfirmationModal.swift
@@ -22,7 +22,7 @@ public class ConfirmationModal: Modal {
         let explanation: String?
         let attributedExplanation: NSAttributedString?
         let accessibilityLabel: String?
-        let accessibilityId: String?
+        let accessibilityIdentifier: String?
         public let stateToShow: State
         let confirmTitle: String?
         let confirmAccessibilityLabel: String?
@@ -57,7 +57,7 @@ public class ConfirmationModal: Modal {
             self.explanation = explanation
             self.attributedExplanation = attributedExplanation
             self.accessibilityLabel = accessibilityLabel
-            self.accessibilityId = accessibilityId
+            self.accessibilityIdentifier = accessibilityId
             self.stateToShow = stateToShow
             self.confirmTitle = confirmTitle
             self.confirmAccessibilityLabel = confirmAccessibilityLabel
@@ -241,8 +241,8 @@ public class ConfirmationModal: Modal {
         cancelButton.setTitle(info.cancelTitle, for: .normal)
         cancelButton.setThemeTitleColor(info.cancelStyle, for: .normal)
         
-        self.accessibilityLabel = info.accessibilityLabel
-        self.contentView.accessibilityIdentifier = info.accessibilityId
+        self.contentView.accessibilityLabel = info.accessibilityLabel
+        self.contentView.accessibilityIdentifier = info.accessibilityIdentifier
     }
     
     required init?(coder: NSCoder) {
diff --git a/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift b/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift
index 532d363ec..f290c43f5 100644
--- a/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift	
+++ b/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift	
@@ -58,6 +58,8 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
         self.themeBackgroundColor = .clear
 
         textView.delegate = self
+        textView.accessibilityIdentifier = "Text input box"
+        textView.isAccessibilityElement = true
 
         let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.")
         sendButton.setTitle(sendTitle, for: .normal)
@@ -66,6 +68,8 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
         sendButton.titleLabel?.font = .boldSystemFont(ofSize: Values.mediumFontSize)
         sendButton.titleLabel?.textAlignment = .center
         sendButton.themeTintColor = .textPrimary
+        sendButton.accessibilityIdentifier = "Send button"
+        sendButton.isAccessibilityElement = true
 
         // Increase hit area of send button
         sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8)
diff --git a/SignalUtilitiesKit/Shared View Controllers/ModalActivityIndicatorViewController.swift b/SignalUtilitiesKit/Shared View Controllers/ModalActivityIndicatorViewController.swift
index 07d12166d..0cb3d92ba 100644
--- a/SignalUtilitiesKit/Shared View Controllers/ModalActivityIndicatorViewController.swift	
+++ b/SignalUtilitiesKit/Shared View Controllers/ModalActivityIndicatorViewController.swift	
@@ -40,6 +40,8 @@ public class ModalActivityIndicatorViewController: OWSViewController {
         result.set(.width, to: 64)
         result.set(.height, to: 64)
         
+        result.accessibilityIdentifier = "Loading animation"
+        
         ThemeManager.onThemeChange(observer: result) { [weak result] theme, _ in
             guard let textPrimary: UIColor = theme.color(for: .textPrimary) else { return }