diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
index ea30eb1e4..a0dbdcc05 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
@@ -56,8 +56,8 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<FooterStatusDisplayItem>{
-		private final TextView reply, boost, favorite;
-		private final ImageView share, bookmark;
+		private final TextView replies, boosts, favorites;
+		private final View reply, boost, favorite, share, bookmark;
 		private static final Animation opacityOut, opacityIn;
 
 		private View touchingView = null;
@@ -91,21 +91,16 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_footer, parent);
-			reply=findViewById(R.id.reply);
-			boost=findViewById(R.id.boost);
-			favorite=findViewById(R.id.favorite);
-			bookmark=findViewById(R.id.bookmark);
-			share=findViewById(R.id.share);
-			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
-				UiUtils.fixCompoundDrawableTintOnAndroid6(reply);
-				UiUtils.fixCompoundDrawableTintOnAndroid6(boost);
-				UiUtils.fixCompoundDrawableTintOnAndroid6(favorite);
-			}
-			View reply=findViewById(R.id.reply_btn);
-			View boost=findViewById(R.id.boost_btn);
-			View favorite=findViewById(R.id.favorite_btn);
-			View share=findViewById(R.id.share_btn);
-			View bookmark=findViewById(R.id.bookmark_btn);
+			replies=findViewById(R.id.reply);
+			boosts=findViewById(R.id.boost);
+			favorites=findViewById(R.id.favorite);
+
+			reply=findViewById(R.id.reply_btn);
+			boost=findViewById(R.id.boost_btn);
+			favorite=findViewById(R.id.favorite_btn);
+			share=findViewById(R.id.share_btn);
+			bookmark=findViewById(R.id.bookmark_btn);
+
 			reply.setOnTouchListener(this::onButtonTouch);
 			reply.setOnClickListener(this::onReplyClick);
 			reply.setOnLongClickListener(this::onReplyLongClick);
@@ -130,9 +125,9 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void onBind(FooterStatusDisplayItem item){
-			bindButton(reply, item.status.repliesCount);
-			bindButton(boost, item.status.reblogsCount);
-			bindButton(favorite, item.status.favouritesCount);
+			bindButton(replies, item.status.repliesCount);
+			bindButton(boosts, item.status.reblogsCount);
+			bindButton(favorites, item.status.favouritesCount);
 			// in thread view, direct descendant posts display one direct reply to themselves,
 			// hence in that case displaying whether there is another reply
 			int compareTo = item.isMainStatus || !item.hasDescendantNeighbor ? 0 : 1;
@@ -220,13 +215,13 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				onBoostLongClick(v);
 				return;
 			}
-			boost.setSelected(!item.status.reblogged);
+			boosts.setSelected(!item.status.reblogged);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(item.status, !item.status.reblogged, null, r->boostConsumer(v, r));
 		}
 
 		private void boostConsumer(View v, Status r) {
 			v.startAnimation(opacityIn);
-			bindButton(boost, r.reblogsCount);
+			bindButton(boosts, r.reblogsCount);
 		}
 
 		private boolean onBoostLongClick(View v){
@@ -312,10 +307,10 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onFavoriteClick(View v){
-			favorite.setSelected(!item.status.favourited);
+			favorites.setSelected(!item.status.favourited);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
 				v.startAnimation(opacityIn);
-				bindButton(favorite, r.favouritesCount);
+				bindButton(favorites, r.favouritesCount);
 			});
 		}
 
diff --git a/mastodon/src/main/res/color/boost_icon.xml b/mastodon/src/main/res/color/boost_icon.xml
index e50a9554a..9efc146c8 100644
--- a/mastodon/src/main/res/color/boost_icon.xml
+++ b/mastodon/src/main/res/color/boost_icon.xml
@@ -2,5 +2,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="?android:colorAccent" android:state_selected="true"/>
 	<item android:color="?android:textColorSecondary" android:state_enabled="true"/>
-	<item android:color="?android:textColorSecondary" android:alpha="0.3"/>
+	<item android:color="?colorIconDisabled" />
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_footer.xml b/mastodon/src/main/res/layout/display_item_footer.xml
index e1a173b2b..420f8b529 100644
--- a/mastodon/src/main/res/layout/display_item_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_footer.xml
@@ -18,80 +18,105 @@
 			android:layout_weight="1"
 			android:layout_width="0dp"
 			android:layout_height="match_parent">
-			<FrameLayout
+			<LinearLayout
 				android:id="@+id/reply_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:paddingHorizontal="16dp"
 				android:paddingVertical="12dp">
+				<ImageView
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:layout_marginStart="16dp"
+					android:duplicateParentState="true"
+					android:src="@drawable/ic_fluent_chat_multiple_24sp_selector_text"
+					android:tint="?android:textColorSecondary"
+					android:gravity="center_vertical" />
 				<TextView
 					android:id="@+id/reply"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:layout_gravity="center_vertical"
-					android:drawableStart="@drawable/ic_fluent_chat_multiple_24sp_selector_text"
-					android:drawablePadding="8dp"
-					android:drawableTint="?android:textColorSecondary"
+					android:paddingStart="8dp"
+					android:minWidth="16dp"
 					android:gravity="center_vertical"
 					android:textAppearance="@style/m3_label_large"
 					android:maxLines="1"
 					android:ellipsize="end"
-					tools:text="123"/>
-			</FrameLayout>
+					tools:text="123"
+					tools:ignore="RtlSymmetry" />
+			</LinearLayout>
 		</FrameLayout>
 
 		<FrameLayout
 			android:layout_weight="1"
 			android:layout_width="0dp"
 			android:layout_height="match_parent">
-			<FrameLayout
+			<LinearLayout
 				android:id="@+id/boost_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:paddingHorizontal="16dp"
+				android:foregroundTint="@color/boost_icon"
 				android:paddingVertical="12dp">
+				<ImageView
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:layout_marginStart="16dp"
+					android:duplicateParentState="true"
+					android:src="@drawable/ic_boost"
+					android:tint="@color/boost_icon"
+					android:gravity="center_vertical" />
 				<TextView
 					android:id="@+id/boost"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:layout_gravity="center_vertical"
-					android:drawableStart="@drawable/ic_boost"
-					android:drawablePadding="8dp"
-					android:drawableTint="@color/boost_icon"
+					android:paddingStart="8dp"
+					android:minWidth="16dp"
 					android:textColor="@color/boost_icon"
 					android:gravity="center_vertical"
 					android:textAppearance="@style/m3_label_large"
 					android:maxLines="1"
 					android:ellipsize="end"
-					tools:text="123"/>
-			</FrameLayout>
+					tools:text="123"
+					tools:ignore="RtlSymmetry" />
+			</LinearLayout>
 		</FrameLayout>
 
 		<FrameLayout
 			android:layout_weight="1"
 			android:layout_width="0dp"
 			android:layout_height="match_parent">
-			<FrameLayout
+			<LinearLayout
 				android:id="@+id/favorite_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:paddingHorizontal="16dp"
 				android:paddingVertical="12dp">
+				<ImageView
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:layout_marginStart="16dp"
+					android:duplicateParentState="true"
+					android:src="@drawable/ic_fluent_star_24sp_selector"
+					android:tint="@color/favorite_icon"
+					android:gravity="center_vertical" />
 				<TextView
 					android:id="@+id/favorite"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:layout_gravity="center_vertical"
-					android:drawableStart="@drawable/ic_fluent_star_24sp_selector"
-					android:drawablePadding="8dp"
-					android:drawableTint="@color/favorite_icon"
+					android:paddingStart="8dp"
+					android:minWidth="16dp"
 					android:textColor="@color/favorite_icon"
 					android:gravity="center_vertical"
 					android:textAppearance="@style/m3_label_large"
 					android:maxLines="1"
 					android:ellipsize="end"
-					tools:text="123"/>
-			</FrameLayout>
+					tools:text="123"
+					tools:ignore="RtlSymmetry" />
+			</LinearLayout>
 		</FrameLayout>
 
 		<FrameLayout
@@ -102,13 +127,13 @@
 				android:id="@+id/bookmark_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:paddingHorizontal="16dp"
 				android:paddingVertical="12dp">
 				<ImageView
 					android:id="@+id/bookmark"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:layout_gravity="center_vertical"
+					android:layout_marginHorizontal="16dp"
 					android:src="@drawable/ic_fluent_bookmark_24sp_selector"
 					android:tint="@color/bookmark_icon"
 					android:gravity="center_vertical"
@@ -120,13 +145,13 @@
 			android:id="@+id/share_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:paddingHorizontal="16dp"
 			android:paddingVertical="12dp">
 			<ImageView
 				android:id="@+id/share"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
 				android:layout_gravity="center_vertical"
+				android:layout_marginHorizontal="16dp"
 				android:src="@drawable/ic_fluent_share_24sp_regular"
 				android:tint="?android:textColorSecondary"
 				android:gravity="center_vertical"/>
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index 86ffa2122..95b630003 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -21,6 +21,7 @@
 	<attr name="colorAccentLightest" format="color"/>
 	<attr name="profileHeaderBackground" format="color"/>
 	<attr name="toolbarBackground" format="color"/>
+	<attr name="colorIconDisabled" format="color"/>
 
 	<attr name="colorButtonBackgroundPrimaryDarkOnLight" format="color"/>
 	<attr name="colorButtonBackgroundPrimaryDarkOnLightDisabled" format="color"/>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index c29fc5452..12e31868e 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -28,6 +28,7 @@
 		<item name="android:colorBackground">?colorGray100</item>
 		<item name="android:textColorPrimary">?colorGray800</item>
 		<item name="android:textColorSecondary">?colorGray500</item>
+		<item name="colorIconDisabled">?colorGray300</item>
 		<item name="colorButtonText">?colorGray50</item>
 		<item name="colorSecondary">#E9EDF2</item>
 		<item name="colorBackgroundLight">?colorGray50</item>
@@ -127,6 +128,7 @@
 		<item name="android:colorBackground">?colorGray700</item>
 		<item name="android:textColorPrimary">?colorGray50</item>
 		<item name="android:textColorSecondary">?colorGray400</item>
+		<item name="colorIconDisabled">?colorGray500</item>
 		<item name="colorButtonText">?colorGray800</item>
 		<item name="colorSecondary">#E9EDF2</item>
 		<item name="colorBackgroundLight">?colorGray700</item>