diff --git a/Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift b/Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
index 0f0e99ffc..20e511aec 100644
--- a/Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift	
+++ b/Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift	
@@ -28,7 +28,8 @@ extension ContextMenuVC {
         private func setUpViewHierarchy() {
             // Icon
             let iconSize = ActionView.iconSize
-            let iconImageView = UIImageView(image: action.icon.resizedImage(to: CGSize(width: iconSize, height: iconSize))!.withTint(Colors.text))
+            let iconImageView = UIImageView(image: action.icon.resizedImage(to: CGSize(width: iconSize, height: iconSize))!.withRenderingMode(.alwaysTemplate))
+            iconImageView.tintColor = Colors.text
             let iconImageViewSize = ActionView.iconImageViewSize
             iconImageView.set(.width, to: iconImageViewSize)
             iconImageView.set(.height, to: iconImageViewSize)
diff --git a/Session/Conversations/Context Menu/ContextMenuVC+EmojiReactsView.swift b/Session/Conversations/Context Menu/ContextMenuVC+EmojiReactsView.swift
index d46573888..691d9a0e9 100644
--- a/Session/Conversations/Context Menu/ContextMenuVC+EmojiReactsView.swift	
+++ b/Session/Conversations/Context Menu/ContextMenuVC+EmojiReactsView.swift	
@@ -66,7 +66,8 @@ extension ContextMenuVC {
 
         private func setUpViewHierarchy() {
             // Icon image
-            let iconImageView = UIImageView(image: #imageLiteral(resourceName: "ic_plus_24").withTint(Colors.text))
+            let iconImageView = UIImageView(image: #imageLiteral(resourceName: "ic_plus_24").withRenderingMode(.alwaysTemplate))
+            iconImageView.tintColor = Colors.text
             iconImageView.set(.width, to: iconSize)
             iconImageView.set(.height, to: iconSize)
             iconImageView.contentMode = .scaleAspectFit
diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index 19fda911b..bffe01694 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -530,6 +530,9 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
         window.rootViewController = contextMenuVC
         window.makeKeyAndVisible()
         window.backgroundColor = .clear
+        if #available(iOS 13.0, *) {
+            window.overrideUserInterfaceStyle = isDarkMode ? .dark : .light
+        }
     }
 
     func handleViewItemTapped(_ viewItem: ConversationViewItem, gestureRecognizer: UITapGestureRecognizer) {
diff --git a/Session/Meta/Session-Info.plist b/Session/Meta/Session-Info.plist
index 54e23fb8d..3bb826685 100644
--- a/Session/Meta/Session-Info.plist
+++ b/Session/Meta/Session-Info.plist
@@ -90,7 +90,7 @@
 	<key>NSContactsUsageDescription</key>
 	<string>Signal uses your contacts to find users you know. We do not store your contacts on the server.</string>
 	<key>NSFaceIDUsageDescription</key>
-	<string>Session's Screen Lock feature uses Face ID.</string>
+	<string>Session&apos;s Screen Lock feature uses Face ID.</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>com.loki-project.loki-messenger</string>
 	<key>NSMicrophoneUsageDescription</key>