From 5432f2590c0968cf8d90e82f9aac822a704244d3 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sun, 4 Jun 2023 05:00:48 +0200
Subject: [PATCH] fine-tune footer layout

---
 .../displayitems/TextStatusDisplayItem.java   | 12 +++++-----
 mastodon/src/main/res/drawable/ic_boost.xml   |  6 ++---
 ...c_fluent_arrow_repeat_all_24sp_regular.xml |  3 +++
 ...uent_arrow_repeat_all_24sp_very_filled.xml | 23 +++++++++++++++++++
 ...uent_arrow_repeat_all_off_24sp_regular.xml |  3 +++
 .../ic_fluent_bookmark_24sp_filled.xml        |  3 +++
 .../ic_fluent_bookmark_24sp_regular.xml       |  3 +++
 .../ic_fluent_bookmark_24sp_selector.xml      |  8 +++++++
 .../ic_fluent_chat_multiple_24sp_regular.xml  |  3 +++
 ...fluent_chat_multiple_24sp_regular_text.xml | 15 ++++++++++++
 ...luent_chat_multiple_24sp_selector_text.xml |  6 +++++
 .../drawable/ic_fluent_share_24sp_regular.xml |  3 +++
 .../drawable/ic_fluent_star_24sp_filled.xml   |  3 +++
 .../drawable/ic_fluent_star_24sp_regular.xml  |  3 +++
 .../drawable/ic_fluent_star_24sp_selector.xml |  8 +++++++
 .../main/res/layout/display_item_footer.xml   | 23 +++++++++++--------
 16 files changed, 106 insertions(+), 19 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_very_filled.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_off_24sp_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_filled.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_selector.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular_text.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_selector_text.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_share_24sp_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_star_24sp_filled.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_star_24sp_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_star_24sp_selector.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
index 77e1b1c5a..a6d419c49 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
@@ -238,12 +238,12 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 			// remove additional padding when (transparently padded) translate button is visible
 			int pos = getAbsoluteAdapterPosition();
-			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(),
-					(translateVisible &&
-							item.parentFragment.getDisplayItems().size() >= pos + 1 &&
-							item.parentFragment.getDisplayItems().get(pos + 1) instanceof FooterStatusDisplayItem)
-							? 0 : V.dp(12)
-			);
+			boolean nextIsFooter = item.parentFragment.getDisplayItems().size() >= pos + 1 &&
+					item.parentFragment.getDisplayItems().get(pos + 1) instanceof FooterStatusDisplayItem;
+			int bottomPadding = (translateVisible && nextIsFooter) ? 0
+					: nextIsFooter ? V.dp(8)
+					: V.dp(12);
+			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), bottomPadding);
 
 			if (!GlobalUserPreferences.collapseLongPosts) {
 				textScrollView.setLayoutParams(wrapParams);
diff --git a/mastodon/src/main/res/drawable/ic_boost.xml b/mastodon/src/main/res/drawable/ic_boost.xml
index 64f632e5b..a14cebaa2 100644
--- a/mastodon/src/main/res/drawable/ic_boost.xml
+++ b/mastodon/src/main/res/drawable/ic_boost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24_very_filled"/>
-	<item android:state_enabled="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24_regular"/>
-	<item android:drawable="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
+	<item android:state_selected="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24sp_very_filled"/>
+	<item android:state_enabled="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24sp_regular"/>
+	<item android:drawable="@drawable/ic_fluent_arrow_repeat_all_off_24sp_regular"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_regular.xml
new file mode 100644
index 000000000..ee22e43a2
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M14.61 2.47l-0.077-0.067C14.24 2.18 13.818 2.201 13.55 2.47l-0.068 0.077c-0.223 0.296-0.201 0.718 0.068 0.988l1.971 1.977H8.5L8.267 5.516C4.785 5.639 2 8.51 2 12.036c0 1.69 0.64 3.23 1.692 4.39l0.072 0.069c0.131 0.111 0.3 0.179 0.486 0.179 0.414 0 0.75-0.337 0.75-0.753 0-0.173-0.058-0.332-0.156-0.46l-0.2-0.23C3.93 14.363 3.5 13.249 3.5 12.035c0-2.771 2.239-5.018 5-5.018h6.881l-1.832 1.84-0.067 0.078C13.26 9.23 13.281 9.653 13.55 9.922c0.292 0.294 0.767 0.294 1.06 0l3.182-3.194 0.067-0.077c0.224-0.295 0.202-0.717-0.067-0.987L14.61 2.471zm5.62 5.101c-0.13-0.109-0.297-0.174-0.48-0.174-0.414 0-0.75 0.337-0.75 0.752 0 0.187 0.068 0.358 0.18 0.488 0.82 0.894 1.32 2.088 1.32 3.398 0 2.772-2.239 5.019-5 5.019H8.558l1.905-1.911 0.074-0.086c0.197-0.267 0.195-0.636-0.007-0.902l-0.067-0.077-0.084-0.073c-0.267-0.199-0.635-0.197-0.9 0.006l-0.076 0.067-3.182 3.194-0.073 0.085c-0.198 0.267-0.196 0.636 0.006 0.902l0.067 0.077 3.182 3.194 0.084 0.072c0.293 0.22 0.71 0.195 0.976-0.073 0.269-0.269 0.291-0.692 0.068-0.987l-0.068-0.077-1.899-1.906H15.5l0.233-0.004C19.215 18.432 22 15.56 22 12.035c0-1.693-0.643-3.236-1.697-4.395L20.23 7.57z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_very_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_very_filled.xml
new file mode 100644
index 000000000..15d5e44f6
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24sp_very_filled.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24sp"
+    android:height="24sp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,9.123C7.423,9.123 6.125,10.421 6.125,11.994C6.125,12.523 6.269,13.014 6.514,13.434C6.514,13.435 6.513,13.436 6.514,13.438L6.619,13.607L6.623,13.613C6.666,13.679 6.706,13.747 6.744,13.816L7.787,12.775C9.015,11.549 10.977,11.548 12.205,12.775C12.789,13.359 13.077,14.104 13.105,14.863L15.002,14.863C16.579,14.863 17.875,13.567 17.875,11.992C17.875,11.463 17.731,10.972 17.486,10.553L17.486,10.549L17.381,10.379C17.337,10.311 17.295,10.241 17.256,10.17L16.215,11.211C14.986,12.439 13.025,12.44 11.797,11.213C11.218,10.634 10.931,9.885 10.902,9.123L9,9.123z"
+      android:strokeWidth="3"
+      android:fillColor="#212121"/>
+  <path
+      android:pathData="M20.787,8.06C20.603,7.828 20.319,7.678 20,7.678c-0.552,0 -1,0.447 -1,0.999 0,0.208 0.064,0.401 0.172,0.561C19.695,10.028 20,10.975 20,11.993c0,2.759 -2.238,4.996 -4.999,4.996l-5.586,-0.001 1.294,-1.291 0.084,-0.095c0.281,-0.362 0.279,-0.872 -0.006,-1.231L10.709,14.284 10.614,14.2C10.252,13.92 9.741,13.922 9.382,14.206L9.294,14.284 6.289,17.287 6.206,17.382c-0.281,0.362 -0.279,0.872 0.006,1.231l0.078,0.087 3.005,3.003 0.094,0.083c0.392,0.305 0.96,0.277 1.32,-0.083 0.363,-0.362 0.389,-0.934 0.078,-1.326l-0.078,-0.087 -1.304,-1.303 5.596,0.001 0.241,-0.004C18.996,18.857 22,15.776 22,11.993 22,10.534 21.552,9.178 20.787,8.057Z"
+      android:fillColor="#212121"/>
+  <path
+      android:pathData="M14.712,2.289 L14.625,2.211C14.233,1.901 13.661,1.926 13.298,2.289L13.22,2.376C12.91,2.768 12.936,3.34 13.298,3.702l1.299,1.297 -5.598,0 -0.241,0.004C5.004,5.13 2,8.211 2,11.993c0,1.445 0.438,2.787 1.189,3.898 0.182,0.251 0.477,0.415 0.811,0.415 0.552,0 1,-0.447 1,-0.999C5,15.091 4.931,14.891 4.815,14.729L4.68,14.511C4.248,13.772 4,12.911 4,11.993 4,9.234 6.238,6.998 8.999,6.998L14.595,6.998 13.298,8.295 13.22,8.382c-0.311,0.392 -0.285,0.964 0.078,1.326 0.391,0.39 1.024,0.39 1.414,0L17.718,6.705 17.795,6.618C18.106,6.226 18.08,5.654 17.718,5.292Z"
+      android:strokeWidth="3"
+      android:fillColor="#212121"/>
+  <path
+      android:pathData="M20.11,5.619L20.11,5.619A1.393,0.037 0,0 1,21.503 5.656L21.503,5.656A1.393,0.037 0,0 1,20.11 5.693L20.11,5.693A1.393,0.037 0,0 1,18.717 5.656L18.717,5.656A1.393,0.037 0,0 1,20.11 5.619z"
+      android:strokeWidth="52.513"
+      android:fillColor="#613583"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.0156863"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_off_24sp_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_off_24sp_regular.xml
new file mode 100644
index 000000000..bf315efcb
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_off_24sp_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M3.196 2.147L3.28 2.22l18.5 18.5c0.293 0.293 0.293 0.767 0 1.06-0.266 0.267-0.683 0.29-0.976 0.073L20.72 21.78l-3.509-3.508c-0.436 0.12-0.89 0.194-1.358 0.219L15.5 18.5H8.564l1.9 1.9 0.066 0.076c0.224 0.294 0.202 0.715-0.067 0.984-0.266 0.266-0.683 0.29-0.976 0.072L9.403 21.46 6.22 18.278 6.154 18.2c-0.202-0.265-0.204-0.632-0.006-0.899l0.073-0.085 3.182-3.182 0.076-0.067c0.265-0.201 0.633-0.203 0.9-0.006l0.084 0.073 0.068 0.077c0.2 0.264 0.203 0.632 0.005 0.899l-0.073 0.085L8.558 17H15.5c0.142 0 0.283-0.006 0.421-0.017L6.402 7.46C4.687 8.254 3.5 9.988 3.5 12c0 1.296 0.493 2.477 1.302 3.365C4.925 15.497 5 15.675 5 15.872c0 0.414-0.336 0.75-0.75 0.75-0.222 0-0.421-0.097-0.559-0.25C2.641 15.22 2 13.684 2 12c0-2.421 1.324-4.533 3.287-5.652L2.22 3.28c-0.293-0.293-0.293-0.767 0-1.06 0.266-0.267 0.683-0.29 0.976-0.073zM19.75 7.378c0.22 0 0.416 0.094 0.553 0.244C21.357 8.775 22 10.312 22 12c0 2.057-0.955 3.89-2.446 5.081l-1.069-1.07C19.708 15.1 20.5 13.644 20.5 12c0-1.306-0.5-2.495-1.32-3.386-0.112-0.13-0.18-0.3-0.18-0.486 0-0.414 0.336-0.75 0.75-0.75zm-5.217-4.976L14.61 2.47l3.182 3.182c0.269 0.268 0.291 0.69 0.067 0.984l-0.067 0.076-3.182 3.182c-0.293 0.293-0.768 0.293-1.06 0-0.269-0.268-0.291-0.69-0.068-0.984l0.068-0.076L15.38 7H9.473l-1.48-1.48c0.091-0.007 0.182-0.013 0.274-0.016L8.5 5.5h7.021L13.55 3.53c-0.268-0.268-0.29-0.69-0.067-0.983L13.55 2.47c0.268-0.269 0.69-0.291 0.983-0.068z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_filled.xml
new file mode 100644
index 000000000..2412d01ac
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_filled.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.19 21.855c-0.495 0.357-1.187 0.002-1.187-0.61V6.25C5.003 4.455 6.458 3 8.253 3h7.498c1.795 0 3.25 1.455 3.25 3.25v14.996c0 0.611-0.692 0.966-1.188 0.609l-5.81-4.181-5.812 4.18z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_regular.xml
new file mode 100644
index 000000000..c32c5603b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.19 21.855c-0.495 0.357-1.187 0.002-1.187-0.61V6.25C5.003 4.455 6.458 3 8.253 3h7.498c1.795 0 3.25 1.455 3.25 3.25v14.996c0 0.611-0.692 0.966-1.188 0.609l-5.81-4.181-5.812 4.18zM17.502 6.25c0-0.966-0.783-1.75-1.75-1.75H8.253c-0.967 0-1.75 0.784-1.75 1.75v13.532l5.061-3.641c0.262-0.188 0.614-0.188 0.876 0l5.061 3.641V6.25z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_selector.xml b/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_selector.xml
new file mode 100644
index 000000000..9e81bec2b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_bookmark_24sp_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--~ Copyright (c) 2022. ~ Microsoft Corporation. All rights reserved.-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_fluent_bookmark_24sp_filled" android:state_activated="true"/>
+    <item android:drawable="@drawable/ic_fluent_bookmark_24sp_filled" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_fluent_bookmark_24sp_filled" android:state_selected="true"/>
+    <item android:drawable="@drawable/ic_fluent_bookmark_24sp_regular"/>
+</selector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular.xml
new file mode 100644
index 000000000..98a4373b4
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M9.562 3c-4.143 0-7.5 3.358-7.5 7.5 0 1.133 0.251 2.209 0.702 3.173L2.04 16.515c-0.233 0.913 0.59 1.744 1.504 1.524 0.75-0.18 1.903-0.457 2.93-0.702C7.417 17.763 8.463 18 9.563 18c4.142 0 7.5-3.358 7.5-7.5 0-4.142-3.358-7.5-7.5-7.5zm-6 7.5c0-3.314 2.686-6 6-6 3.313 0 6 2.686 6 6s-2.687 6-6 6c-0.961 0-1.867-0.225-2.67-0.625l-0.244-0.121-0.264 0.063c-0.923 0.22-1.99 0.475-2.788 0.667l0.69-2.708 0.07-0.276-0.13-0.253C3.8 12.425 3.562 11.49 3.562 10.5zm11 10.5c-1.97 0-3.762-0.759-5.1-2h0.1c0.718 0 1.415-0.089 2.08-0.257 0.865 0.482 1.86 0.757 2.92 0.757 0.96 0 1.866-0.225 2.67-0.625l0.243-0.121 0.264 0.063c0.922 0.22 1.966 0.445 2.74 0.61-0.175-0.751-0.414-1.756-0.642-2.651l-0.07-0.276 0.13-0.253c0.425-0.822 0.665-1.755 0.665-2.747 0-2.115-1.094-3.974-2.747-5.042-0.179-0.724-0.45-1.41-0.8-2.048 2.937 1.017 5.047 3.807 5.047 7.09 0 1.133-0.252 2.21-0.703 3.174 0.253 1.008 0.509 2.1 0.671 2.803 0.205 0.885-0.575 1.686-1.467 1.5-0.727-0.152-1.87-0.396-2.913-0.64C16.706 20.763 15.66 21 14.561 21z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular_text.xml b/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular_text.xml
new file mode 100644
index 000000000..3adbf88f5
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_regular_text.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24sp"
+    android:height="24sp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.562,3C5.419,3 2.062,6.358 2.062,10.5C2.062,11.633 2.313,12.709 2.764,13.673C2.51,14.671 2.226,15.784 2.04,16.515C1.807,17.428 2.629,18.259 3.544,18.039C4.294,17.859 5.447,17.582 6.474,17.337C7.417,17.763 8.462,18 9.562,18C13.704,18 17.062,14.642 17.062,10.5C17.062,6.358 13.704,3 9.562,3ZM3.562,10.5C3.562,7.186 6.248,4.5 9.562,4.5C12.875,4.5 15.562,7.186 15.562,10.5C15.562,13.814 12.875,16.5 9.562,16.5C8.601,16.5 7.695,16.275 6.892,15.875L6.648,15.754L6.384,15.817C5.461,16.036 4.395,16.292 3.596,16.484C3.795,15.705 4.058,14.672 4.286,13.776L4.356,13.5L4.226,13.247C3.801,12.425 3.562,11.491 3.562,10.5ZM14.562,21C12.592,21 10.8,20.241 9.462,19C9.495,19 9.528,19 9.562,19C10.28,19 10.977,18.911 11.643,18.743C12.507,19.225 13.502,19.5 14.562,19.5C15.522,19.5 16.428,19.275 17.232,18.875L17.475,18.754L17.74,18.817C18.661,19.036 19.705,19.263 20.479,19.426C20.304,18.676 20.065,17.671 19.837,16.776L19.767,16.5L19.897,16.247C20.322,15.425 20.562,14.491 20.562,13.5C20.562,11.385 19.468,9.526 17.815,8.458C17.636,7.734 17.365,7.048 17.015,6.411C19.952,7.427 22.062,10.217 22.062,13.5C22.062,14.633 21.81,15.709 21.359,16.674C21.612,17.682 21.868,18.774 22.03,19.477C22.235,20.362 21.455,21.163 20.563,20.977C19.836,20.825 18.693,20.581 17.649,20.337C16.707,20.763 15.661,21 14.562,21Z"
+      android:fillColor="@color/fluent_default_icon_tint" />
+  <path
+      android:pathData="M7.297,8.312L11.85,8.312A0.75,0.75 0,0 1,12.6 9.062L12.6,9.062A0.75,0.75 0,0 1,11.85 9.812L7.297,9.812A0.75,0.75 0,0 1,6.547 9.062L6.547,9.062A0.75,0.75 0,0 1,7.297 8.312z"
+      android:fillColor="@color/fluent_default_icon_tint" />
+  <path
+      android:pathData="M7.297,11.312L10.323,11.312A0.75,0.75 0,0 1,11.073 12.062L11.073,12.062A0.75,0.75 0,0 1,10.323 12.812L7.297,12.812A0.75,0.75 0,0 1,6.547 12.062L6.547,12.062A0.75,0.75 0,0 1,7.297 11.312z"
+      android:fillColor="@color/fluent_default_icon_tint" />
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_selector_text.xml b/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_selector_text.xml
new file mode 100644
index 000000000..4e3f84614
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24sp_selector_text.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--~ Copyright (c) 2022. ~ Microsoft Corporation. All rights reserved.-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_fluent_chat_multiple_24sp_regular_text" android:state_selected="true"/>
+    <item android:drawable="@drawable/ic_fluent_chat_multiple_24sp_regular"/>
+</selector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_share_24sp_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_share_24sp_regular.xml
new file mode 100644
index 000000000..b2e6ddd0b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_share_24sp_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.747 4h3.464c0.414 0 0.75 0.335 0.75 0.75 0 0.38-0.282 0.693-0.648 0.743L10.21 5.499H6.747c-1.191 0-2.166 0.926-2.245 2.097L4.497 7.75v9.5c0 1.19 0.925 2.165 2.096 2.244L6.747 19.5h9.5c1.191 0 2.166-0.926 2.245-2.096l0.005-0.154v-0.498c0-0.415 0.336-0.75 0.75-0.75 0.38 0 0.694 0.282 0.744 0.648l0.006 0.102v0.498c0 2.004-1.572 3.64-3.55 3.744L16.247 21h-9.5c-2.005 0-3.642-1.573-3.745-3.551l-0.005-0.2v-9.5c0-2.004 1.572-3.64 3.55-3.744l0.2-0.006h3.464-3.464zM14.5 6.52V3.75c0-0.624 0.706-0.96 1.187-0.61l0.082 0.068 5.994 5.75c0.28 0.269 0.306 0.7 0.077 0.998l-0.077 0.085-5.994 5.752c-0.45 0.432-1.182 0.154-1.262-0.435L14.5 15.251v-2.725l-0.344 0.03c-2.4 0.25-4.7 1.331-6.915 3.26-0.519 0.453-1.322 0.025-1.236-0.658C6.67 9.838 9.452 6.907 14.2 6.54l0.3-0.02V3.75v2.77zM16 5.507V7.25C16 7.663 15.665 8 15.25 8c-3.874 0-6.274 1.676-7.312 5.157L7.86 13.435l0.352-0.237C10.45 11.737 12.798 11 15.251 11c0.38 0 0.693 0.283 0.743 0.649l0.006 0.1v1.743L20.16 9.5 16 5.508z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_star_24sp_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_star_24sp_filled.xml
new file mode 100644
index 000000000..92118cbfb
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_star_24sp_filled.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10.788 3.102c0.495-1.003 1.926-1.003 2.421 0l2.358 4.778 5.273 0.766c1.107 0.16 1.549 1.522 0.748 2.303l-3.816 3.719 0.901 5.25c0.19 1.104-0.968 1.945-1.959 1.424l-4.716-2.48-4.715 2.48c-0.99 0.52-2.148-0.32-1.96-1.423l0.901-5.251-3.815-3.72c-0.801-0.78-0.359-2.141 0.748-2.302L8.43 7.88l2.358-4.778z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_star_24sp_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_star_24sp_regular.xml
new file mode 100644
index 000000000..8c946162a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_star_24sp_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24sp" android:height="24sp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10.788 3.102c0.495-1.003 1.926-1.003 2.421 0l2.358 4.778 5.273 0.766c1.107 0.16 1.549 1.522 0.748 2.303l-3.816 3.719 0.901 5.25c0.19 1.104-0.968 1.945-1.959 1.424l-4.716-2.48-4.715 2.48c-0.99 0.52-2.148-0.32-1.96-1.423l0.901-5.251-3.815-3.72c-0.801-0.78-0.359-2.141 0.748-2.302L8.43 7.88l2.358-4.778zm1.21 0.937L9.74 8.614C9.543 9.013 9.163 9.29 8.724 9.353l-5.05 0.734 3.654 3.562c0.318 0.31 0.463 0.757 0.388 1.195l-0.862 5.029 4.516-2.375c0.394-0.207 0.863-0.207 1.257 0l4.516 2.375-0.862-5.03c-0.075-0.438 0.07-0.884 0.388-1.194l3.654-3.562-5.05-0.734c-0.44-0.064-0.82-0.34-1.016-0.739l-2.259-4.576z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_star_24sp_selector.xml b/mastodon/src/main/res/drawable/ic_fluent_star_24sp_selector.xml
new file mode 100644
index 000000000..faf7363fa
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_star_24sp_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--~ Copyright (c) 2022. ~ Microsoft Corporation. All rights reserved.-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_fluent_star_24sp_filled" android:state_activated="true"/>
+    <item android:drawable="@drawable/ic_fluent_star_24sp_filled" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_fluent_star_24sp_filled" android:state_selected="true"/>
+    <item android:drawable="@drawable/ic_fluent_star_24sp_regular"/>
+</selector>
diff --git a/mastodon/src/main/res/layout/display_item_footer.xml b/mastodon/src/main/res/layout/display_item_footer.xml
index dcd358586..3f92635db 100644
--- a/mastodon/src/main/res/layout/display_item_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_footer.xml
@@ -10,7 +10,9 @@
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="48dp">
+		android:layout_height="wrap_content"
+		android:paddingHorizontal="11sp">
+		<!-- avatar width (46sp) / 2 - button width (24sp) / 2 -->
 
 		<FrameLayout
 			android:layout_weight="1"
@@ -21,13 +23,13 @@
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
 				android:paddingHorizontal="16dp"
-				android:minWidth="56dp">
+				android:paddingVertical="12dp">
 				<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_24_selector_text"
+					android:drawableStart="@drawable/ic_fluent_chat_multiple_24sp_selector_text"
 					android:drawablePadding="8dp"
 					android:drawableTint="?android:textColorSecondary"
 					android:gravity="center_vertical"
@@ -47,7 +49,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
 				android:paddingHorizontal="16dp"
-				android:minWidth="56dp">
+				android:paddingVertical="12dp">
 				<TextView
 					android:id="@+id/boost"
 					android:layout_width="wrap_content"
@@ -74,13 +76,13 @@
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
 				android:paddingHorizontal="16dp"
-				android:minWidth="56dp">
+				android:paddingVertical="12dp">
 				<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_24_selector"
+					android:drawableStart="@drawable/ic_fluent_star_24sp_selector"
 					android:drawablePadding="8dp"
 					android:drawableTint="@color/favorite_icon"
 					android:textColor="@color/favorite_icon"
@@ -101,13 +103,13 @@
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
 				android:paddingHorizontal="16dp"
-				android:minWidth="56dp">
+				android:paddingVertical="12dp">
 				<ImageView
 					android:id="@+id/bookmark"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:layout_gravity="center_vertical"
-					android:src="@drawable/ic_fluent_bookmark_24_selector"
+					android:src="@drawable/ic_fluent_bookmark_24sp_selector"
 					android:tint="@color/bookmark_icon"
 					android:gravity="center_vertical"
 					android:textAppearance="@style/m3_label_large" />
@@ -118,13 +120,14 @@
 			android:id="@+id/share_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:paddingHorizontal="16dp">
+			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:src="@drawable/ic_fluent_share_24_regular"
+				android:src="@drawable/ic_fluent_share_24sp_regular"
 				android:tint="?android:textColorSecondary"
 				android:gravity="center_vertical"/>
 		</FrameLayout>