diff --git a/res/layout/accessibility_edit_magnification_mode.xml b/res/layout/accessibility_edit_magnification_mode.xml
index bdc355d2551..e4f31328fae 100644
--- a/res/layout/accessibility_edit_magnification_mode.xml
+++ b/res/layout/accessibility_edit_magnification_mode.xml
@@ -28,12 +28,19 @@
         android:padding="24dp">
 
         <TextView
-            style="@style/AccessibilityDialogDescription"
-            android:text="@string/accessibility_magnification_area_settings_message" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/accessibility_magnification_area_settings_message"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_marginBottom="24dp"/>
 
         <include
             android:id="@+id/magnify_full_screen"
-            layout="@layout/accessibility_edit_shortcut_component" />
+            layout="@layout/accessibility_edit_shortcut_component"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp" />
 
         <include
             android:id="@+id/magnify_window_screen"
diff --git a/res/layout/accessibility_edit_shortcut_component.xml b/res/layout/accessibility_edit_shortcut_component.xml
index 074a8783436..d257be63e23 100644
--- a/res/layout/accessibility_edit_shortcut_component.xml
+++ b/res/layout/accessibility_edit_shortcut_component.xml
@@ -57,6 +57,6 @@
         android:layout_width="176dp"
         android:layout_height="176dp"
         android:layout_marginStart="44dp"
-        android:scaleType="centerCrop" />
+        android:scaleType="fitCenter" />
 
 </LinearLayout>