diff --git a/Tusker/Screens/Compose/ComposeViewController.swift b/Tusker/Screens/Compose/ComposeViewController.swift
index bc75ff54a6..96b645ec6b 100644
--- a/Tusker/Screens/Compose/ComposeViewController.swift
+++ b/Tusker/Screens/Compose/ComposeViewController.swift
@@ -187,6 +187,18 @@ class ComposeViewController: UIViewController {
 //        }
     }
     
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        
+        let imageName: String
+        if traitCollection.userInterfaceStyle == .dark {
+            imageName = "photo.fill"
+        } else {
+            imageName = "photo"
+        }
+        addAttachmentButton.setImage(UIImage(systemName: imageName), for: .normal)
+    }
+    
     func createFormattingButtons() -> [UIBarButtonItem] {
         guard Preferences.shared.statusContentType != .plain else {
             return []
diff --git a/Tusker/Screens/Compose/ComposeViewController.xib b/Tusker/Screens/Compose/ComposeViewController.xib
index 02fa6cf11e..9ed1e78e0a 100644
--- a/Tusker/Screens/Compose/ComposeViewController.xib
+++ b/Tusker/Screens/Compose/ComposeViewController.xib
@@ -136,7 +136,7 @@
                                                                 <constraint firstAttribute="height" constant="80" id="sGZ-uD-CtS"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                                            <state key="normal" title="     Add image or video" image="More">
+                                                            <state key="normal" title="     Add image or video" image="photo" catalog="system">
                                                                 <color key="titleColor" cocoaTouchSystemColor="systemBlueColor"/>
                                                             </state>
                                                             <connections>
@@ -198,6 +198,6 @@
         </view>
     </objects>
     <resources>
-        <image name="More" width="60" height="30"/>
+        <image name="photo" catalog="system" width="64" height="48"/>
     </resources>
 </document>