diff --git a/mastodon/src/main/res/layout/compose_fab.xml b/mastodon/src/main/res/layout/compose_fab.xml
index 84f55f281..a5989ee05 100644
--- a/mastodon/src/main/res/layout/compose_fab.xml
+++ b/mastodon/src/main/res/layout/compose_fab.xml
@@ -12,4 +12,5 @@
     android:scaleType="center"
     android:stateListAnimator="@animator/fab_shadow"
     android:contentDescription="@string/new_post"
+    android:tooltipText="@string/new_post"
     android:src="@drawable/ic_fluent_compose_24_filled" />
diff --git a/mastodon/src/main/res/layout/compose_poll_option.xml b/mastodon/src/main/res/layout/compose_poll_option.xml
index 64585eca9..d58c73957 100644
--- a/mastodon/src/main/res/layout/compose_poll_option.xml
+++ b/mastodon/src/main/res/layout/compose_poll_option.xml
@@ -32,6 +32,7 @@
 		android:src="@drawable/ic_fluent_delete_24_regular"
 		android:background="?android:selectableItemBackground"
 		android:contentDescription="@string/delete_poll_option"
+		android:tooltipText="@string/delete_poll_option"
 		android:tint="?colorM3OnSurfaceVariant"
 		android:scaleType="center"
 		/>
@@ -44,6 +45,7 @@
 		android:scaleType="center"
 		android:tint="?colorM3OnSurfaceVariant"
 		android:contentDescription="@string/reorder"
+		android:tooltipText="@string/reorder"
 		android:paddingStart="4dp"
 		android:src="@drawable/ic_fluent_re_order_dots_vertical_20_filled"
 		tools:ignore="RtlSymmetry" />
diff --git a/mastodon/src/main/res/layout/fragment_timeline.xml b/mastodon/src/main/res/layout/fragment_timeline.xml
index 32b2fb594..54a184421 100644
--- a/mastodon/src/main/res/layout/fragment_timeline.xml
+++ b/mastodon/src/main/res/layout/fragment_timeline.xml
@@ -32,6 +32,7 @@
 			android:scaleType="center"
 			android:stateListAnimator="@animator/fab_shadow"
 			android:contentDescription="@string/new_post"
+			android:tooltipText="@string/new_post"
 			android:src="@drawable/ic_fluent_compose_24_filled"/>
 
 		<FrameLayout