diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index cc11b75e..ae5ab90d 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -46,11 +46,9 @@
             android:id="@+id/tvHintSupport"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="6dp"
             android:gravity="center_vertical"
             android:minHeight="33dp"
+            android:padding="6dp"
             android:text="@string/title_hint_support"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
@@ -71,7 +69,6 @@
             android:id="@+id/vSeparatorHintSupport"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="6dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ibHintSupport" />
@@ -80,11 +77,9 @@
             android:id="@+id/tvHintActions"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="6dp"
             android:gravity="center_vertical"
             android:minHeight="33dp"
+            android:padding="6dp"
             android:text="@string/title_hint_message_actions"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
@@ -105,7 +100,6 @@
             android:id="@+id/vSeparatorHintActions"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="6dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHintActions" />