diff --git a/res/layout/accessibility_shortcut_option_checkable.xml b/res/layout/accessibility_shortcut_option_checkable.xml
index a5c55950f77..15513520a7f 100644
--- a/res/layout/accessibility_shortcut_option_checkable.xml
+++ b/res/layout/accessibility_shortcut_option_checkable.xml
@@ -32,23 +32,22 @@
         android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         android:background="@null"
         android:clickable="false"
         android:focusable="false"
         android:gravity="center_vertical"
         android:orientation="vertical"
+        app:layout_constrainedHeight="true"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="@android:id/title"
-        app:layout_constraintEnd_toStartOf="@android:id/title"
-        app:layout_constraintHeight="true"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth="true" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@android:id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
         android:textAppearance="?android:attr/textAppearanceLarge"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@android:id/checkbox"
@@ -61,6 +60,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"
+        app:layout_constrainedHeight="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@android:id/title"
         app:layout_constraintTop_toBottomOf="@android:id/title"
@@ -75,6 +75,7 @@
         android:adjustViewBounds="true"
         android:background="@drawable/protection_background"
         android:maxHeight="@dimen/accessibility_imageview_size"
+        app:layout_constrainedHeight="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="@android:id/title"