diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java
index abf0c05f..4fe486c9 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java
@@ -109,11 +109,11 @@ public class AnnouncementAdapter extends RecyclerView.Adapter<AnnouncementAdapte
         } else {
             holder.binding.dates.setVisibility(View.GONE);
         }
-        holder.binding.layoutReactions.statusEmoji.setOnClickListener(v -> {
+        holder.binding.statusEmoji.setOnClickListener(v -> {
             EmojiManager.install(new EmojiOneProvider());
-            final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.binding.layoutReactions.statusEmoji).setOnEmojiPopupDismissListener(() -> {
+            final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.binding.statusEmoji).setOnEmojiPopupDismissListener(() -> {
                 InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(holder.binding.layoutReactions.statusEmoji.getWindowToken(), 0);
+                imm.hideSoftInputFromWindow(holder.binding.statusEmoji.getWindowToken(), 0);
             }).setOnEmojiClickListener((emoji, imageView) -> {
                 String emojiStr = imageView.getUnicode();
                 boolean alreadyAdded = false;
@@ -146,7 +146,7 @@ public class AnnouncementAdapter extends RecyclerView.Adapter<AnnouncementAdapte
                     .build(holder.binding.layoutReactions.fakeEdittext);
             emojiPopup.toggle();
         });
-        holder.binding.layoutReactions.statusAddCustomEmoji.setOnClickListener(v -> {
+        holder.binding.statusAddCustomEmoji.setOnClickListener(v -> {
             final AlertDialog.Builder builder = new AlertDialog.Builder(context, Helper.dialogStyle());
             int paddingPixel = 15;
             float density = context.getResources().getDisplayMetrics().density;
@@ -223,4 +223,4 @@ public class AnnouncementAdapter extends RecyclerView.Adapter<AnnouncementAdapte
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
index f95e410b..b2837cef 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
@@ -335,11 +335,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             } else {
                 holder.binding.layoutReactions.reactionsView.setAdapter(null);
             }
-            holder.binding.layoutReactions.statusEmoji.setOnClickListener(v -> {
+            holder.binding.statusEmoji.setOnClickListener(v -> {
                 EmojiManager.install(new EmojiOneProvider());
-                final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.binding.layoutReactions.statusEmoji).setOnEmojiPopupDismissListener(() -> {
+                final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.binding.statusEmoji).setOnEmojiPopupDismissListener(() -> {
                     InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(holder.binding.layoutReactions.statusEmoji.getWindowToken(), 0);
+                    imm.hideSoftInputFromWindow(holder.binding.statusEmoji.getWindowToken(), 0);
                 }).setOnEmojiClickListener((emoji, imageView) -> {
                     String emojiStr = imageView.getUnicode();
                     boolean alreadyAdded = false;
@@ -375,7 +375,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                         .build(holder.binding.layoutReactions.fakeEdittext);
                 emojiPopup.toggle();
             });
-            holder.binding.layoutReactions.statusAddCustomEmoji.setOnClickListener(v -> {
+            holder.binding.statusAddCustomEmoji.setOnClickListener(v -> {
 
                 final AlertDialog.Builder builder = new AlertDialog.Builder(context, Helper.dialogStyle());
                 int paddingPixel = 15;
@@ -2044,4 +2044,4 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/drawer_announcement.xml b/app/src/main/res/layout/drawer_announcement.xml
index c0c40807..db61eb40 100644
--- a/app/src/main/res/layout/drawer_announcement.xml
+++ b/app/src/main/res/layout/drawer_announcement.xml
@@ -59,9 +59,38 @@
             tools:maxLines="10"
             tools:text="@tools:sample/lorem/random" />
 
-        <include
-            android:id="@+id/layout_reactions"
-            layout="@layout/layout_reactions" />
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/content">
+
+            <include
+                android:id="@+id/layout_reactions"
+                layout="@layout/layout_reactions"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/status_add_custom_emoji"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:contentDescription="@string/add_reaction"
+                android:padding="3dp"
+                android:src="@drawable/ic_baseline_emoji_emotions_24"
+                app:tint="?attr/iconColor" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/status_emoji"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_marginStart="6dp"
+                android:contentDescription="@string/add_reaction"
+                android:padding="3dp"
+                android:src="@drawable/ic_baseline_add_reaction_24"
+                app:tint="?attr/iconColor" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index b6caece7..b135fcca 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -27,13 +27,14 @@
     app:cardElevation="0dp">
 
     <androidx.appcompat.widget.LinearLayoutCompat
+        android:id="@+id/main_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="6dp"
-        android:id="@+id/main_container"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:orientation="vertical">
+
         <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
             android:layout_height="1dp" />
@@ -591,6 +592,30 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/status_add_custom_emoji"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:contentDescription="@string/add_reaction"
+                android:padding="3dp"
+                android:src="@drawable/ic_baseline_emoji_emotions_24"
+                app:tint="?attr/iconColor" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/status_emoji"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_marginStart="6dp"
+                android:contentDescription="@string/add_reaction"
+                android:padding="3dp"
+                android:src="@drawable/ic_baseline_add_reaction_24"
+                app:tint="?attr/iconColor" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/action_button_more"
                 style="@style/Widget.AppCompat.Button.Borderless"
diff --git a/app/src/main/res/layout/layout_reactions.xml b/app/src/main/res/layout/layout_reactions.xml
index 46e4b1a0..8ebc9c59 100644
--- a/app/src/main/res/layout/layout_reactions.xml
+++ b/app/src/main/res/layout/layout_reactions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/status_reactions"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,10 +7,7 @@
     android:layout_marginTop="10dp"
     android:layout_marginBottom="10dp"
     android:orientation="horizontal"
-    android:paddingBottom="10dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@id/content">
+    android:paddingBottom="10dp">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/reactions_view"
@@ -19,32 +15,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="1" />
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/status_add_custom_emoji"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="5dp"
-        android:contentDescription="@string/add_reaction"
-        android:src="@drawable/ic_baseline_emoji_emotions_24"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?attr/iconColor" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/status_emoji"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="5dp"
-        android:contentDescription="@string/add_reaction"
-        android:src="@drawable/ic_baseline_add_reaction_24"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?attr/iconColor" />
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -57,4 +27,4 @@
             android:importantForAutofill="noExcludeDescendants"
             android:inputType="text" />
     </LinearLayout>
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.appcompat.widget.LinearLayoutCompat>