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 f6e4a44f6..02316cb92 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;
+	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup, attachPopup;
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
@@ -327,7 +327,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		sensitiveItem=view.findViewById(R.id.sensitive_item);
 		replyText=view.findViewById(R.id.reply_text);
 
-		mediaBtn.setOnClickListener(v->openFilePicker());
+		if (isPhotoPickerAvailable()) {
+			PopupMenu attachPopup = new PopupMenu(getContext(), mediaBtn);
+			attachPopup.inflate(R.menu.attach);
+			attachPopup.setOnMenuItemClickListener(i -> {
+				openFilePicker(i.getItemId() == R.id.media);
+				return true;
+			});
+			UiUtils.enablePopupMenuIcons(getContext(), attachPopup);
+			mediaBtn.setOnClickListener(v->attachPopup.show());
+			mediaBtn.setOnTouchListener(attachPopup.getDragToOpenListener());
+		} else {
+			mediaBtn.setOnClickListener(v -> openFilePicker(false));
+		}
 		pollBtn.setOnClickListener(v->togglePoll());
 		emojiBtn.setOnClickListener(v->emojiKeyboard.toggleKeyboardPopup(mainEditText));
 		spoilerBtn.setOnClickListener(v->toggleSpoiler());
@@ -1176,9 +1188,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	 *
 	 * <p>For earlier versions use the built in docs ui via {@link Intent#ACTION_GET_CONTENT}
 	 */
-	private void openFilePicker(){
+	private void openFilePicker(boolean photoPicker){
 		Intent intent;
-		boolean usePhotoPicker = isPhotoPickerAvailable();
+		boolean usePhotoPicker = photoPicker && isPhotoPickerAvailable();
 		if (usePhotoPicker) {
 			intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
 			intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
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
new file mode 100644
index 000000000..06c6ed284
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_attach_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="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_document_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_document_24_regular.xml
new file mode 100644
index 000000000..8fab94e5e
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_document_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.5 20c0 0.275-0.224 0.5-0.5 0.5H6c-0.276 0-0.5-0.225-0.5-0.5V4c0-0.275 0.224-0.5 0.5-0.5h6V8c0 1.104 0.896 2 2 2h4.5v10zm-5-15.379L17.378 8.5H14c-0.276 0-0.5-0.225-0.5-0.5V4.621zm5.914 3.793l-5.829-5.828C13.559 2.56 13.527 2.54 13.5 2.516c-0.071-0.064-0.141-0.127-0.219-0.18-0.04-0.027-0.086-0.045-0.128-0.068-0.071-0.04-0.141-0.084-0.216-0.116-0.197-0.082-0.409-0.123-0.624-0.138C12.266 2.011 12.22 2 12.172 2H6C4.896 2 4 2.896 4 4v16c0 1.104 0.896 2 2 2h12c1.104 0 2-0.896 2-2V9.828c0-0.53-0.211-1.039-0.586-1.414z" 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 3253288b8..cd9f3e051 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_image_24_regular"/>
+				android:src="@drawable/ic_fluent_attach_24_regular"/>
 
 			<ImageButton
 				android:id="@+id/btn_poll"
diff --git a/mastodon/src/main/res/menu/attach.xml b/mastodon/src/main/res/menu/attach.xml
new file mode 100644
index 000000000..53920919e
--- /dev/null
+++ b/mastodon/src/main/res/menu/attach.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/media"
+        android:title="@string/sk_add_media"
+        android:icon="@drawable/ic_fluent_image_24_regular" />
+    <item
+        android:id="@+id/file"
+        android:title="@string/sk_attach_file"
+        android:icon="@drawable/ic_fluent_document_24_regular" />
+</menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index db16b5cfe..796586124 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -174,4 +174,6 @@
     <string name="sk_post_edited">edited</string>
     <string name="sk_notification_type_update">Edited posts</string>
     <string name="sk_notify_update">Edits a reblogged post</string>
+    <string name="sk_add_media">Add media</string>
+    <string name="sk_attach_file">Attach file</string>
 </resources>
\ No newline at end of file