diff --git a/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt b/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
index e8925af96..0bb098b3a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
@@ -3,12 +3,14 @@ package com.topjohnwu.magisk.databinding
 import android.animation.ValueAnimator
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
+import android.util.TypedValue
 import android.view.ContextThemeWrapper
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.Toolbar
+import androidx.cardview.widget.CardView
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.updateLayoutParams
@@ -302,3 +304,10 @@ fun setListeners(
         attrChange.onChange()
     }
 }
+
+@BindingAdapter("cardBackgroundColorAttr")
+fun CardView.setCardBackgroundColorAttr(attr: Int) {
+    val tv = TypedValue()
+    context.theme.resolveAttribute(attr, tv, true)
+    setCardBackgroundColor(tv.data)
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
index c40fbab90..b3abea3ba 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
@@ -9,7 +9,7 @@ import com.topjohnwu.magisk.utils.set
 import org.json.JSONObject
 
 enum class SafetyNetState {
-    LOADING, PASS, FAILED, IDLE
+    LOADING, PASS, FAILED
 }
 
 data class SafetyNetResult(
@@ -42,7 +42,7 @@ class SafetynetViewModel : BaseViewModel() {
     @get:Bindable
     val isSuccess get() = currentState == PASS
 
-    private var currentState = IDLE
+    private var currentState = LOADING
         set(value) = set(value, field, { field = it }, BR.checking, BR.failed, BR.success)
 
     init {
diff --git a/app/src/main/res/layout/fragment_install_md2.xml b/app/src/main/res/layout/fragment_install_md2.xml
index 4d97a6f58..5ff2fda5e 100644
--- a/app/src/main/res/layout/fragment_install_md2.xml
+++ b/app/src/main/res/layout/fragment_install_md2.xml
@@ -96,33 +96,27 @@
                             <CheckBox
                                 gone="@{Info.isSAR}"
                                 style="@style/WidgetFoundation.Checkbox"
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_gravity="start|center_vertical"
                                 android:checked="@={Config.keepVerity}"
-                                android:gravity="center"
                                 android:text="@string/keep_dm_verity"
                                 tools:checked="true" />
 
                             <CheckBox
                                 gone="@{Info.isFBE}"
                                 style="@style/WidgetFoundation.Checkbox"
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_gravity="start|center_vertical"
                                 android:checked="@={Config.keepEnc}"
-                                android:gravity="center"
                                 android:text="@string/keep_force_encryption"
                                 app:tint="?colorPrimary" />
 
                             <CheckBox
                                 gone="@{Info.ramdisk}"
                                 style="@style/WidgetFoundation.Checkbox"
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_gravity="start|center_vertical"
                                 android:checked="@={Config.recovery}"
-                                android:gravity="center"
                                 android:text="@string/recovery_mode"
                                 app:tint="?colorPrimary" />
 
diff --git a/app/src/main/res/layout/fragment_safetynet_md2.xml b/app/src/main/res/layout/fragment_safetynet_md2.xml
index 5dac89512..62e402193 100644
--- a/app/src/main/res/layout/fragment_safetynet_md2.xml
+++ b/app/src/main/res/layout/fragment_safetynet_md2.xml
@@ -7,8 +7,8 @@
 
         <import type="android.os.Build" />
         <import type="com.topjohnwu.magisk.core.Info" />
-
         <import type="com.topjohnwu.magisk.BuildConfig" />
+        <import type="com.topjohnwu.magisk.R" />
 
         <variable
             name="viewModel"
@@ -40,7 +40,7 @@
                 android:textAppearance="@style/AppearanceFoundation.Title" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                invisibleUnless="@{viewModel.success || viewModel.failed}"
+                invisible="@{viewModel.checking}"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingTop="@dimen/l1"
@@ -49,6 +49,7 @@
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/safetynet_attestation"
                     style="@style/WidgetFoundation.Card.Elevated"
+                    cardBackgroundColorAttr="@{viewModel.success ? R.attr.colorPrimary : R.attr.colorError}"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/l1"
@@ -62,30 +63,13 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_bias=".35"
-                    app:layout_constraintWidth_max="300dp">
+                    app:layout_constraintWidth_max="300dp"
+                    tools:cardBackgroundColor="?colorPrimary">
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <View
-                            goneUnless="@{viewModel.failed}"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:alpha=".5"
-                            android:background="?colorError"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <View
-                            goneUnless="@{viewModel.success}"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:alpha=".5"
-                            android:background="?colorPrimary"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
                         <TextView
                             android:id="@+id/safetynet_title"
                             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_hide_md2.xml b/app/src/main/res/layout/item_hide_md2.xml
index 2cb86b700..6904eeaf3 100644
--- a/app/src/main/res/layout/item_hide_md2.xml
+++ b/app/src/main/res/layout/item_hide_md2.xml
@@ -77,8 +77,11 @@
 
                 <com.topjohnwu.widget.IndeterminateCheckBox
                     android:id="@+id/hide_expand_icon"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:minWidth="0dp"
+                    android:minHeight="0dp"
+                    android:layout_marginEnd="@dimen/l1"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index b1075b705..ca237544c 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -21,7 +21,7 @@
         <item name="cardBackgroundColor">?colorSurfaceVariant</item>
         <item name="cardCornerRadius">@dimen/l_50</item>
         <item name="cardElevation">0dp</item>
-        <item name="cardPreventCornerOverlap">true</item>
+        <item name="cardPreventCornerOverlap">false</item>
     </style>
 
     <style name="WidgetFoundation.Card.Primary">
@@ -41,20 +41,18 @@
         <item name="strokeColor">?colorPrimary</item>
     </style>
 
-    <style name="WidgetFoundation.Card.Elevated" parent="Widget.MaterialComponents.CardView">
+    <style name="WidgetFoundation.Card.Elevated">
         <item name="cardBackgroundColor">?colorSurfaceSurfaceVariant</item>
         <item name="cardCornerRadius">@dimen/l_50</item>
         <item name="cardElevation">@dimen/l_125</item>
-        <item name="cardPreventCornerOverlap">true</item>
     </style>
 
-    <style name="WidgetFoundation.Card.OnPrimary" parent="Widget.MaterialComponents.CardView">
+    <style name="WidgetFoundation.Card.OnPrimary">
         <item name="cardCornerRadius">@dimen/l_50</item>
         <item name="cardElevation">0dp</item>
         <item name="strokeColor">?colorOnPrimaryVariant</item>
         <item name="strokeWidth">1dp</item>
         <item name="cardBackgroundColor">?colorPrimary</item>
-        <item name="cardPreventCornerOverlap">true</item>
     </style>