diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index ad0711d98..c1359bc23 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -174,7 +174,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 
 	private Button publishButton, languageButton, scheduleTimeBtn, draftsBtn;
-	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup, attachPopup;
+	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup;
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
diff --git a/mastodon/src/main/res/drawable/ic_fluent_attach_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_attach_24_regular.xml
deleted file mode 100644
index 06c6ed284..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_attach_24_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M11.772 3.744c2.342-2.344 6.14-2.344 8.484 0 2.283 2.283 2.341 5.948 0.175 8.302l-0.188 0.197-8.8 8.798-0.036 0.03c-1.462 1.317-3.716 1.273-5.123-0.135-1.319-1.319-1.441-3.381-0.366-4.838 0.023-0.046 0.051-0.09 0.085-0.13l0.053-0.06 0.087-0.088 0.141-0.148 0.003 0.003 7.436-7.454c0.266-0.267 0.682-0.291 0.976-0.074l0.084 0.073c0.267 0.265 0.292 0.682 0.074 0.976L14.785 9.28 7.19 16.893c-0.718 0.876-0.668 2.17 0.15 2.988 0.829 0.829 2.149 0.868 3.024 0.118l8.833-8.83c1.756-1.758 1.756-4.607-0.002-6.365-1.702-1.702-4.43-1.755-6.196-0.16l-0.168 0.16L12.82 4.82l-9.537 9.536c-0.293 0.293-0.768 0.293-1.06 0-0.267-0.266-0.29-0.683-0.073-0.977l0.073-0.084 9.549-9.55h0.001z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_image_add_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_image_add_24_regular.xml
new file mode 100644
index 000000000..6f44920f6
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_image_add_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M18.75 4C20.545 4 22 5.455 22 7.25v11.5c0 1.795-1.455 3.25-3.25 3.25H7.25C5.455 22 4 20.545 4 18.75v-6.248c0.474 0.198 0.977 0.34 1.5 0.422v5.826c0 0.208 0.036 0.408 0.103 0.594l5.823-5.701c0.833-0.816 2.142-0.854 3.02-0.116l0.128 0.116 5.822 5.702c0.067-0.186 0.104-0.386 0.104-0.595V7.25c0-0.966-0.784-1.75-1.75-1.75h-5.826C12.843 4.977 12.7 4.474 12.502 4h6.248zm-6.191 10.644l-0.084 0.07-5.807 5.687C6.85 20.465 7.046 20.5 7.25 20.5h11.5c0.203 0 0.399-0.035 0.58-0.099l-5.805-5.686c-0.265-0.26-0.675-0.283-0.966-0.071zM16.252 7.5c1.244 0 2.252 1.008 2.252 2.252 0 1.244-1.008 2.252-2.252 2.252-1.244 0-2.252-1.008-2.252-2.252C14 8.508 15.008 7.5 16.252 7.5zM6.5 1C9.538 1 12 3.462 12 6.5S9.538 12 6.5 12 1 9.538 1 6.5 3.462 1 6.5 1zm9.752 8C15.837 9 15.5 9.337 15.5 9.752s0.337 0.752 0.752 0.752c0.416 0 0.752-0.336 0.752-0.752C17.004 9.337 16.667 9 16.252 9zM6.5 3L6.41 3.006C6.206 3.044 6.045 3.205 6.008 3.41L6 3.5V6H3.498l-0.09 0.008C3.204 6.045 3.043 6.206 3.006 6.41L2.998 6.5l0.008 0.09c0.037 0.204 0.198 0.365 0.402 0.402L3.498 7H6v2.504l0.008 0.09C6.045 9.798 6.206 9.958 6.41 9.995l0.09 0.009 0.09-0.009c0.204-0.037 0.365-0.197 0.402-0.402L7 9.503V7h2.505l0.09-0.008c0.203-0.037 0.363-0.198 0.4-0.402l0.009-0.09-0.009-0.09C9.96 6.206 9.8 6.045 9.595 6.008L9.504 6H7V3.5L6.992 3.41C6.955 3.204 6.794 3.043 6.59 3.006L6.5 3z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index cd9f3e051..b205b2bfa 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -329,7 +329,7 @@
 				android:tintMode="src_in"
 				android:contentDescription="@string/add_media"
 				android:tooltipText="@string/add_media"
-				android:src="@drawable/ic_fluent_attach_24_regular"/>
+				android:src="@drawable/ic_fluent_image_add_24_regular"/>
 
 			<ImageButton
 				android:id="@+id/btn_poll"