diff --git a/src/cheogram/res/layout/command_button_grid_field.xml b/src/cheogram/res/layout/command_button_grid_field.xml
index b1f7b5bc63eb2ced96cf15c4ea37f67dc0ea196c..a84189bcf08783e52e5aa8384414cad9f636c44d 100644
--- a/src/cheogram/res/layout/command_button_grid_field.xml
+++ b/src/cheogram/res/layout/command_button_grid_field.xml
@@ -29,15 +29,27 @@
         <com.google.android.material.button.MaterialButton
             style="@style/Widget.Material3.Button.TonalButton"
             android:id="@+id/default_button"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="40dp"
             android:layout_marginLeft="40dp"
             android:layout_marginBottom="24dp"
             android:layout_marginTop="24dp"
+				android:layout_gravity="center_horizontal"
             android:gravity="center"
             android:textAllCaps="false"
-            android:minHeight="75dp" />
+            android:minHeight="35dp" />
+
+        <TextView
+            android:id="@+id/default_button_seperator"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="8dp"
+            android:gravity="center"
+				android:layout_gravity="center_horizontal"
+            android:textAppearance="?textAppearanceBodyMedium"
+            android:text="or" />
 
         <com.cheogram.android.GridView
             android:id="@+id/buttons"
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index c3fd28b7d6a27422662309f352543c50998da7af..b85fbebef8e88060a39686c95f7eec2c838ea8bc 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2674,14 +2674,16 @@ public class Conversation extends AbstractEntity
                     }
                     if (defaultOption == null) {
                         binding.defaultButton.setVisibility(View.GONE);
+                        binding.defaultButtonSeperator.setVisibility(View.GONE);
                     } else {
                         theOptions.remove(defaultOption);
                         binding.defaultButton.setVisibility(View.VISIBLE);
+                        binding.defaultButtonSeperator.setVisibility(View.VISIBLE);
 
                         final SVG defaultIcon = defaultOption.getIcon();
                         if (defaultIcon != null) {
                              DisplayMetrics display = mPager.get().getContext().getResources().getDisplayMetrics();
-                             int height = (int)(display.heightPixels*display.density/4);
+                             int height = (int)(display.heightPixels*display.density/8);
                              binding.defaultButton.setCompoundDrawablesRelativeWithIntrinsicBounds(null, getDrawableForSVG(defaultIcon, defaultOption.getIconEl(), height), null, null);
                         }