diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
index f347eb54e..fb87d6416 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
@@ -27,8 +27,8 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
 
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -204,6 +204,15 @@ public class ComposeMediaViewController{
 		}
 	}
 
+	private void updateButton(ImageButton btn, @DrawableRes int drawableId, @StringRes int labelId){
+		btn.setImageResource(drawableId);
+		String label=fragment.getContext().getString(labelId);
+		btn.setContentDescription(label);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
+			btn.setTooltipText(label);
+		}
+	}
+
 	private View createMediaAttachmentView(DraftMediaAttachment draft){
 		View thumb=fragment.getActivity().getLayoutInflater().inflate(R.layout.compose_media_thumb, attachmentsView, false);
 		ImageView img=thumb.findViewById(R.id.thumb);
@@ -266,11 +275,11 @@ public class ComposeMediaViewController{
 			draft.subtitleView.setText(subtitleRes);
 		}
 		draft.titleView.setText(fragment.getString(R.string.attachment_x_percent_uploaded, 0));
-		draft.removeButton.setImageResource(R.drawable.ic_baseline_close_24);
+		updateButton(draft.removeButton, R.drawable.ic_fluent_dismiss_24_regular, R.string.delete);
 
 		if(draft.state==AttachmentUploadState.ERROR){
 			draft.titleView.setText(R.string.upload_failed);
-			draft.editButton.setImageResource(R.drawable.ic_fluent_arrow_counterclockwise_24_regular);
+			updateButton(draft.removeButton, R.drawable.ic_fluent_arrow_counterclockwise_24_regular, R.string.retry);
 			draft.editButton.setOnClickListener(this::onRetryOrCancelMediaUploadClick);
 			draft.progressBar.setVisibility(View.GONE);
 			draft.setUseErrorColors(true);
@@ -280,7 +289,7 @@ public class ComposeMediaViewController{
 			draft.editButton.setOnClickListener(this::onEditMediaDescriptionClick);
 		}else{
 			draft.editButton.setVisibility(View.GONE);
-			draft.removeButton.setImageResource(R.drawable.ic_baseline_close_24);
+			updateButton(draft.removeButton, R.drawable.ic_fluent_dismiss_24_regular, R.string.delete);
 			if(draft.state==AttachmentUploadState.PROCESSING){
 				draft.titleView.setText(R.string.upload_processing);
 			}else{
@@ -374,7 +383,7 @@ public class ComposeMediaViewController{
 //						attachment.retryButton.setContentDescription(fragment.getString(R.string.retry_upload));
 
 						V.setVisibilityAnimated(attachment.editButton, View.VISIBLE);
-						attachment.editButton.setImageResource(R.drawable.ic_fluent_arrow_counterclockwise_24_regular);
+						updateButton(attachment.editButton, R.drawable.ic_fluent_arrow_counterclockwise_24_regular, R.string.retry);
 						attachment.editButton.setOnClickListener(ComposeMediaViewController.this::onRetryOrCancelMediaUploadClick);
 						attachment.setUseErrorColors(true);
 						V.setVisibilityAnimated(attachment.progressBar, View.GONE);
@@ -478,8 +487,8 @@ public class ComposeMediaViewController{
 			throw new IllegalStateException("Unexpected state "+attachment.state);
 		attachment.uploadRequest=null;
 		attachment.state=AttachmentUploadState.DONE;
-		attachment.editButton.setImageResource(R.drawable.ic_fluent_edit_24_regular);
-		attachment.removeButton.setImageResource(R.drawable.ic_fluent_delete_24_regular);
+		updateButton(attachment.editButton, R.drawable.ic_fluent_edit_24_regular, R.string.sk_edit_alt_text);
+		updateButton(attachment.removeButton, R.drawable.ic_fluent_dismiss_24_regular, R.string.delete);
 		attachment.editButton.setOnClickListener(this::onEditMediaDescriptionClick);
 		V.setVisibilityAnimated(attachment.progressBar, View.GONE);
 		V.setVisibilityAnimated(attachment.editButton, View.VISIBLE);
diff --git a/mastodon/src/main/res/layout/compose_media_thumb.xml b/mastodon/src/main/res/layout/compose_media_thumb.xml
index 1d0a594b6..f76f08bdb 100644
--- a/mastodon/src/main/res/layout/compose_media_thumb.xml
+++ b/mastodon/src/main/res/layout/compose_media_thumb.xml
@@ -57,9 +57,11 @@
 		android:layout_height="48dp"
 		android:layout_alignParentEnd="true"
 		android:layout_alignParentBottom="true"
-		android:layout_marginEnd="16dp"
-		android:layout_marginBottom="8dp"
-		android:src="@drawable/ic_fluent_delete_24_regular"
+		android:layout_marginEnd="4dp"
+		android:layout_marginBottom="4dp"
+		android:contentDescription="@string/delete"
+		android:tooltipText="@string/delete"
+		android:src="@drawable/ic_fluent_dismiss_24_regular"
 		android:tint="?colorM3OnSurfaceVariant"
 		android:backgroundTint="?colorM3OnSurfaceVariant"
 		android:background="@drawable/bg_round_ripple"/>
@@ -70,8 +72,9 @@
 		android:layout_height="48dp"
 		android:layout_toStartOf="@id/delete"
 		android:layout_alignParentBottom="true"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_marginBottom="4dp"
+		android:contentDescription="@string/sk_edit_alt_text"
+		android:tooltipText="@string/sk_edit_alt_text"
 		android:src="@drawable/ic_fluent_edit_24_regular"
 		android:tint="?colorM3OnSurfaceVariant"
 		android:backgroundTint="?colorM3OnSurfaceVariant"
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 67bb61eb5..7306af9fd 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -411,4 +411,5 @@
     <string name="sk_recently_used">Recently used</string>
 	<string name="sk_settings_underlined_links">Underlined links</string>
 	<string name="sk_set_as_default">Set as default</string>
+	<string name="sk_edit_alt_text">Edit alt text</string>
 </resources>
\ No newline at end of file