diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml
index 3959b15c7c8..f4a861cf93d 100644
--- a/res/layout/font_size_preview.xml
+++ b/res/layout/font_size_preview.xml
@@ -17,7 +17,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="16dp"
+    android:paddingTop="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:orientation="vertical">
 
     <TextView
diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index a8408aa239f..1acd677808d 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -19,7 +19,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/conversation_background"
-    android:padding="@dimen/conversation_message_list_padding"
+    android:paddingTop="@dimen/conversation_message_list_padding"
+    android:paddingStart="@dimen/conversation_message_list_padding"
+    android:paddingEnd="@dimen/conversation_message_list_padding"
     android:orientation="vertical"
     android:importantForAccessibility="noHideDescendants">