diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
index 4d663753d..949c0a918 100644
--- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
@@ -308,12 +308,8 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
                             SessionCell.Info(
                                 id: .disappearingMessages,
                                 leftAccessory: .icon(
-                                    UIImage(
-                                        named: (disappearingMessagesConfig.isEnabled ?
-                                            "ic_timer" :
-                                            "ic_timer_disabled"
-                                        )
-                                    )?.withRenderingMode(.alwaysTemplate)
+                                    UIImage(systemName: "timer")?
+                                        .withRenderingMode(.alwaysTemplate)
                                 ),
                                 title: "DISAPPEARING_MESSAGES".localized(),
                                 subtitle: (disappearingMessagesConfig.isEnabled ?
diff --git a/Session/Conversations/Views & Modals/ConversationTitleView.swift b/Session/Conversations/Views & Modals/ConversationTitleView.swift
index 9c24b3132..8418da506 100644
--- a/Session/Conversations/Views & Modals/ConversationTitleView.swift	
+++ b/Session/Conversations/Views & Modals/ConversationTitleView.swift	
@@ -225,7 +225,7 @@ final class ConversationTitleView: UIView {
             // TODO: Disappearing message settings
             if let config = disappearingMessagesConfig, config.isEnabled == true {
                 let imageAttachment = NSTextAttachment()
-                imageAttachment.image = UIImage(named: "ic_timer")?.withTint(textPrimary)
+                imageAttachment.image = UIImage(systemName: "timer")?.withTint(textPrimary)
                 imageAttachment.bounds = CGRect(
                     x: 0,
                     y: -2,