diff --git a/app/build.gradle b/app/build.gradle
index 1c474ac40..2bd136737 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,7 +121,7 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:${vNav}"
 
     implementation 'androidx.biometric:biometric:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.preference:preference:1.1.0'
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
index 661cbfa58..e4659c31e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
@@ -12,7 +12,6 @@ import android.view.ViewGroup
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.updateLayoutParams
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -193,11 +192,11 @@ class MagiskDialog @JvmOverloads constructor(
 
     fun applyView(view: View) = apply {
         resetView()
-        binding.dialogBaseContainer.addView(view)
-        view.updateLayoutParams<ViewGroup.LayoutParams> {
-            width = ViewGroup.LayoutParams.MATCH_PARENT
-            height = ViewGroup.LayoutParams.WRAP_CONTENT
-        }
+        binding.dialogBaseContainer.addView(
+            view,
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
     }
 
     fun onDismiss(callback: OnDialogButtonClickListener) =
diff --git a/app/src/main/res/layout/item_settings_blank.xml b/app/src/main/res/layout/item_settings_blank.xml
index 367f142f1..f8b5be8e3 100644
--- a/app/src/main/res/layout/item_settings_blank.xml
+++ b/app/src/main/res/layout/item_settings_blank.xml
@@ -17,17 +17,16 @@
 
     <com.google.android.material.card.MaterialCardView
         style="@style/WidgetFoundation.Card"
-        android:layout_width="match_parent"
         isEnabled="@{item.enabled}"
-        android:alpha="@{item.enabled ? 1f : .5f}"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:alpha="@{item.enabled ? 1f : .5f}"
         android:onClick="@{(view) -> callback.onItemPressed(view, item)}"
         tools:layout_gravity="center">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?listPreferredItemHeightSmall"
             android:orientation="vertical">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -75,7 +74,7 @@
                     android:text="@{item.title}"
                     android:textAppearance="@style/AppearanceFoundation.Body"
                     android:textStyle="bold"
-                    tools:lines="1"
+                    tools:lines="2"
                     tools:text="@tools:sample/lorem/random" />
 
                 <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/item_settings_input.xml b/app/src/main/res/layout/item_settings_input.xml
index 285c939eb..0772b9829 100644
--- a/app/src/main/res/layout/item_settings_input.xml
+++ b/app/src/main/res/layout/item_settings_input.xml
@@ -27,7 +27,6 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?listPreferredItemHeightSmall"
             android:orientation="vertical">
 
             <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/item_settings_selector.xml b/app/src/main/res/layout/item_settings_selector.xml
index cb8a91fa3..66be0bcc3 100644
--- a/app/src/main/res/layout/item_settings_selector.xml
+++ b/app/src/main/res/layout/item_settings_selector.xml
@@ -17,9 +17,9 @@
 
     <com.google.android.material.card.MaterialCardView
         style="@style/WidgetFoundation.Card"
+        isEnabled="@{item.enabled}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        isEnabled="@{item.enabled}"
         android:alpha="@{item.enabled ? 1f : .5f}"
         android:onClick="@{(view) -> item.onPressed(view, callback)}"
         tools:layout_gravity="center">
@@ -27,7 +27,6 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?listPreferredItemHeightSmall"
             android:orientation="vertical">
 
             <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/item_settings_toggle.xml b/app/src/main/res/layout/item_settings_toggle.xml
index ba9b1ebc5..171bd267d 100644
--- a/app/src/main/res/layout/item_settings_toggle.xml
+++ b/app/src/main/res/layout/item_settings_toggle.xml
@@ -19,17 +19,16 @@
 
     <com.google.android.material.card.MaterialCardView
         style="@style/WidgetFoundation.Card"
-        android:layout_width="match_parent"
         isEnabled="@{item.enabled}"
-        android:alpha="@{item.enabled ? 1f : .5f}"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:alpha="@{item.enabled ? 1f : .5f}"
         android:onClick="@{(view) -> item.onPressed(view, callback)}"
         tools:layout_gravity="center">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?listPreferredItemHeightSmall"
             android:orientation="vertical">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -46,12 +45,12 @@
             <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/toggle_indicator"
                 style="@style/WidgetFoundation.Switch"
+                isEnabled="@{item.enabled}"
                 onTouch="@{(view, event) -> item.onTouched(view, callback, event)}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/l_25"
                 android:checked="@{item.value}"
-                isEnabled="@{item.enabled}"
                 android:text=""
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"