diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
index 3961ef098..dd68ba1f4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
@@ -6,10 +6,7 @@ import android.graphics.drawable.Drawable
 import android.view.ContextThemeWrapper
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.PopupMenu
-import android.widget.ProgressBar
-import android.widget.TextView
+import android.widget.*
 import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.updateLayoutParams
@@ -166,8 +163,8 @@ fun RecyclerView.setDividers(dividerVertical: Drawable?, dividerHorizontal: Draw
 }
 
 @BindingAdapter("app:icon")
-fun MaterialButton.setIconRes(res: Int) {
-    setIconResource(res)
+fun Button.setIconRes(res: Int) {
+    (this as MaterialButton).setIconResource(res)
 }
 
 @BindingAdapter("strokeWidth")
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 5bc3fd3e0..6f96c7832 100644
--- a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
@@ -13,6 +13,7 @@ import android.view.WindowManager
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatDialog
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.view.ViewCompat
 import androidx.core.view.updatePadding
 import androidx.databinding.Bindable
@@ -77,13 +78,9 @@ class MagiskDialog(
         override var callbacks: PropertyChangeRegistry? = null
 
         @get:Bindable
-        var icon = 0
+        var icon: Drawable? = null
             set(value) = set(value, field, { field = it }, BR.icon)
 
-        @get:Bindable
-        var iconRaw: Drawable? = null
-            set(value) = set(value, field, { field = it }, BR.iconRaw)
-
         @get:Bindable
         var title: CharSequence = ""
             set(value) = set(value, field, { field = it }, BR.title)
@@ -185,10 +182,12 @@ class MagiskDialog(
         apply { data.message = message }
 
     fun applyIcon(@DrawableRes drawableRes: Int) =
-        apply { data.icon = drawableRes }
+        apply {
+            data.icon = AppCompatResources.getDrawable(context, drawableRes)
+        }
 
     fun applyIcon(drawable: Drawable) =
-        apply { data.iconRaw = drawable }
+        apply { data.icon = drawable }
 
     fun applyButton(buttonType: ButtonType, builder: ButtonBuilder.() -> Unit) = apply {
         val button = when (buttonType) {
@@ -269,7 +268,7 @@ class MagiskDialog(
 
     fun resetTitle() = applyTitle("")
     fun resetMessage() = applyMessage("")
-    fun resetIcon() = applyIcon(0)
+    fun resetIcon() = apply { data.icon = null }
 
     fun resetButtons() = apply {
         ButtonType.values().forEach {
diff --git a/app/src/main/res/layout/dialog_magisk_base.xml b/app/src/main/res/layout/dialog_magisk_base.xml
index 50c25c874..6a6bf682f 100644
--- a/app/src/main/res/layout/dialog_magisk_base.xml
+++ b/app/src/main/res/layout/dialog_magisk_base.xml
@@ -52,35 +52,21 @@
                         android:orientation="vertical"
                         app:layout_constraintGuide_end="16dp" />
 
-                    <FrameLayout
+                    <ImageView
+                        style="@style/WidgetFoundation.Image.Big"
+                        gone="@{data.icon == null}"
                         android:id="@+id/dialog_base_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="@dimen/l1"
+                        android:src="@{data.icon}"
                         app:layout_constraintBottom_toTopOf="@+id/dialog_base_title"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:src="@drawable/ic_delete_md2" />
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            style="@style/WidgetFoundation.Icon.Primary"
-                            gone="@{data.icon == 0}"
-                            srcCompat="@{data.icon}"
-                            android:layout_gravity="center"
-                            android:layout_marginTop="@dimen/l1"
-                            android:padding="0dp"
-                            tools:src="@drawable/ic_delete_md2" />
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            style="@style/WidgetFoundation.Image.Big"
-                            gone="@{data.iconRaw == null}"
-                            android:layout_gravity="center"
-                            android:layout_marginTop="@dimen/l1"
-                            android:src="@{data.iconRaw}"
-                            tools:src="@drawable/ic_delete_md2" />
-
-                    </FrameLayout>
-
-                    <androidx.appcompat.widget.AppCompatTextView
+                    <TextView
+                        gone="@{data.title.length == 0}"
                         android:id="@+id/dialog_base_title"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -94,142 +80,134 @@
                         tools:lines="1"
                         tools:text="@tools:sample/lorem/random" />
 
-                    <FrameLayout
-                        android:id="@+id/dialog_base_scroll"
+                    <androidx.core.widget.NestedScrollView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/l_50"
+                        android:overScrollMode="ifContentScrolls"
                         app:layout_constrainedHeight="true"
                         app:layout_constraintBottom_toTopOf="@+id/dialog_base_space"
                         app:layout_constraintEnd_toEndOf="@+id/dialog_base_end"
                         app:layout_constraintStart_toStartOf="@+id/dialog_base_start"
                         app:layout_constraintTop_toBottomOf="@+id/dialog_base_title">
 
-                        <androidx.core.widget.NestedScrollView
-                            gone="@{data.message.length == 0}"
+                        <FrameLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
 
-                            <androidx.appcompat.widget.AppCompatTextView
+                            <TextView
+                                gone="@{data.message.length == 0}"
                                 android:id="@+id/dialog_base_message"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:gravity="center"
                                 android:text="@{data.message}"
                                 android:textAppearance="@style/AppearanceFoundation.Body"
                                 tools:lines="3"
                                 tools:text="@tools:sample/lorem/random" />
 
-                        </androidx.core.widget.NestedScrollView>
+                            <FrameLayout
+                                android:id="@+id/dialog_base_container"
+                                gone="@{data.message.length != 0}"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content" />
 
-                        <FrameLayout
-                            android:id="@+id/dialog_base_container"
-                            gone="@{data.message.length != 0}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                        </FrameLayout>
 
-                    </FrameLayout>
+                    </androidx.core.widget.NestedScrollView>
 
                     <Space
                         android:id="@+id/dialog_base_space"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/l1"
+                        android:layout_height="@dimen/l_50"
                         app:layout_constraintBottom_toTopOf="@+id/dialog_base_buttons"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent" />
 
-                    <FrameLayout
+                    <androidx.appcompat.widget.ButtonBarLayout
                         android:id="@+id/dialog_base_buttons"
-                        style="?attr/buttonBarStyle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent">
+                        app:layout_constraintStart_toStartOf="parent"
+                        android:gravity="bottom|center_horizontal"
+                        android:layoutDirection="locale"
+                        android:orientation="horizontal"
+                        android:paddingStart="12dp"
+                        android:paddingTop="4dp"
+                        android:paddingEnd="12dp"
+                        android:paddingBottom="4dp">
 
-                        <androidx.appcompat.widget.ButtonBarLayout
-                            android:layout_width="match_parent"
+                        <Button
+                            android:id="@+id/dialog_base_button_4"
+                            style="@style/WidgetFoundation.Button.Text"
+                            gone="@{data.buttonIDGAF.icon == 0 &amp;&amp; data.buttonIDGAF.title.length == 0}"
+                            isEnabled="@{data.buttonIDGAF.isEnabled()}"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="bottom|center_horizontal"
-                            android:layoutDirection="locale"
-                            android:orientation="horizontal"
-                            android:paddingStart="12dp"
-                            android:paddingTop="4dp"
-                            android:paddingEnd="12dp"
-                            android:paddingBottom="4dp">
+                            android:layout_gravity="center_horizontal"
+                            android:filterTouchesWhenObscured="true"
+                            android:onClick="@{() -> data.buttonIDGAF.clicked()}"
+                            android:text="@{data.buttonIDGAF.title}"
+                            app:icon="@{data.buttonIDGAF.icon}"
+                            tools:icon="@drawable/ic_bug_md2"
+                            tools:text="Button 1" />
 
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/dialog_base_button_4"
-                                style="@style/WidgetFoundation.Button.Text"
-                                gone="@{data.buttonIDGAF.icon == 0 &amp;&amp; data.buttonIDGAF.title.length == 0}"
-                                isEnabled="@{data.buttonIDGAF.isEnabled()}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_horizontal"
-                                android:filterTouchesWhenObscured="true"
-                                android:onClick="@{() -> data.buttonIDGAF.clicked()}"
-                                android:text="@{data.buttonIDGAF.title}"
-                                app:icon="@{data.buttonIDGAF.icon}"
-                                tools:icon="@drawable/ic_bug_md2"
-                                tools:text="Button 1" />
+                        <Button
+                            android:id="@+id/dialog_base_button_2"
+                            style="@style/WidgetFoundation.Button.Text"
+                            gone="@{data.buttonNeutral.icon == 0 &amp;&amp; data.buttonNeutral.title.length == 0}"
+                            isEnabled="@{data.buttonNeutral.isEnabled()}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:filterTouchesWhenObscured="true"
+                            android:onClick="@{() -> data.buttonNeutral.clicked()}"
+                            android:text="@{data.buttonNeutral.title}"
+                            app:icon="@{data.buttonNeutral.icon}"
+                            app:iconGravity="textStart"
+                            tools:icon="@drawable/ic_bug_md2"
+                            tools:text="Button 1" />
 
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/dialog_base_button_2"
-                                style="@style/WidgetFoundation.Button.Text"
-                                gone="@{data.buttonNeutral.icon == 0 &amp;&amp; data.buttonNeutral.title.length == 0}"
-                                isEnabled="@{data.buttonNeutral.isEnabled()}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_horizontal"
-                                android:filterTouchesWhenObscured="true"
-                                android:onClick="@{() -> data.buttonNeutral.clicked()}"
-                                android:text="@{data.buttonNeutral.title}"
-                                app:icon="@{data.buttonNeutral.icon}"
-                                app:iconGravity="textStart"
-                                tools:icon="@drawable/ic_bug_md2"
-                                tools:text="Button 1" />
+                        <Space
+                            android:id="@+id/spacer"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:visibility="invisible" />
 
-                            <Space
-                                android:id="@+id/spacer"
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:layout_weight="1"
-                                android:visibility="invisible" />
+                        <Button
+                            android:id="@+id/dialog_base_button_3"
+                            style="@style/WidgetFoundation.Button.Text"
+                            gone="@{data.buttonNegative.icon == 0 &amp;&amp; data.buttonNegative.title.length == 0}"
+                            isEnabled="@{data.buttonNegative.isEnabled()}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:filterTouchesWhenObscured="true"
+                            android:onClick="@{() -> data.buttonNegative.clicked()}"
+                            android:text="@{data.buttonNegative.title}"
+                            app:icon="@{data.buttonNegative.icon}"
+                            tools:icon="@drawable/ic_bug_md2"
+                            tools:text="Button 1" />
 
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/dialog_base_button_3"
-                                style="@style/WidgetFoundation.Button.Text"
-                                gone="@{data.buttonNegative.icon == 0 &amp;&amp; data.buttonNegative.title.length == 0}"
-                                isEnabled="@{data.buttonNegative.isEnabled()}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_horizontal"
-                                android:filterTouchesWhenObscured="true"
-                                android:onClick="@{() -> data.buttonNegative.clicked()}"
-                                android:text="@{data.buttonNegative.title}"
-                                app:icon="@{data.buttonNegative.icon}"
-                                tools:icon="@drawable/ic_bug_md2"
-                                tools:text="Button 1" />
+                        <Button
+                            android:id="@+id/dialog_base_button_1"
+                            style="@style/WidgetFoundation.Button.Text"
+                            gone="@{data.buttonPositive.icon == 0 &amp;&amp; data.buttonPositive.title.length == 0}"
+                            isEnabled="@{data.buttonPositive.isEnabled()}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:filterTouchesWhenObscured="true"
+                            android:onClick="@{() -> data.buttonPositive.clicked()}"
+                            android:text="@{data.buttonPositive.title}"
+                            app:icon="@{data.buttonPositive.icon}"
+                            app:iconGravity="textStart"
+                            tools:icon="@drawable/ic_bug_md2"
+                            tools:text="Button 1" />
 
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/dialog_base_button_1"
-                                style="@style/WidgetFoundation.Button.Text"
-                                gone="@{data.buttonPositive.icon == 0 &amp;&amp; data.buttonPositive.title.length == 0}"
-                                isEnabled="@{data.buttonPositive.isEnabled()}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_horizontal"
-                                android:filterTouchesWhenObscured="true"
-                                android:onClick="@{() -> data.buttonPositive.clicked()}"
-                                android:text="@{data.buttonPositive.title}"
-                                app:icon="@{data.buttonPositive.icon}"
-                                app:iconGravity="textStart"
-                                tools:icon="@drawable/ic_bug_md2"
-                                tools:text="Button 1" />
-
-                        </androidx.appcompat.widget.ButtonBarLayout>
-
-                    </FrameLayout>
+                    </androidx.appcompat.widget.ButtonBarLayout>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_list_single_line.xml b/app/src/main/res/layout/item_list_single_line.xml
index e0f12d569..da8b3c6cd 100644
--- a/app/src/main/res/layout/item_list_single_line.xml
+++ b/app/src/main/res/layout/item_list_single_line.xml
@@ -14,7 +14,7 @@
 
     </data>
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -28,4 +28,4 @@
         android:textAppearance="@style/AppearanceFoundation.Body"
         tools:text="@tools:sample/lorem" />
 
-</layout>
\ No newline at end of file
+</layout>