diff --git a/app/src/main/java/com/hippo/ehviewer/shortcuts/ShortcutsActivity.java b/app/src/main/java/com/hippo/ehviewer/shortcuts/ShortcutsActivity.java
index f90a89f60..f6937651f 100644
--- a/app/src/main/java/com/hippo/ehviewer/shortcuts/ShortcutsActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/shortcuts/ShortcutsActivity.java
@@ -16,21 +16,22 @@
 
 package com.hippo.ehviewer.shortcuts;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.hippo.ehviewer.download.DownloadService;
 
 /**
  * Created by onlymash on 3/25/18.
  */
 
-public class ShortcutsActivity extends Activity {
+public class ShortcutsActivity extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        String action = null;
+        String action;
         Intent intent = getIntent();
         if (intent != null) {
             action = intent.getAction();
diff --git a/app/src/main/res/layout/dialog_item_select_with_icon.xml b/app/src/main/res/layout/dialog_item_select_with_icon.xml
index b2bef3510..acd9ce577 100644
--- a/app/src/main/res/layout/dialog_item_select_with_icon.xml
+++ b/app/src/main/res/layout/dialog_item_select_with_icon.xml
@@ -26,8 +26,8 @@
     android:drawablePadding="@dimen/keyline_margin"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
     android:paddingLeft="?attr/listPreferredItemPaddingLeft"
     android:paddingRight="?attr/listPreferredItemPaddingRight"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:textColor="?android:attr/textColorAlertDialogListItem" />
+    android:textAppearance="?attr/textAppearanceListItemSmall"
+    android:textColor="?attr/textColorAlertDialogListItem" />
diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml
index be0184d21..edf246b6d 100644
--- a/app/src/main/res/layout/gallery_detail_actions.xml
+++ b/app/src/main/res/layout/gallery_detail_actions.xml
@@ -95,7 +95,10 @@
                 android:id="@+id/torrent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackgroundBorderless"
+                android:clickable="true"
                 android:drawablePadding="8dp"
+                android:focusable="true"
                 android:gravity="center_horizontal"
                 android:textColor="?android:attr/textColorPrimary" />
 
diff --git a/app/src/main/res/layout/item_drawer_favorites.xml b/app/src/main/res/layout/item_drawer_favorites.xml
index 82ef49f73..741885017 100644
--- a/app/src/main/res/layout/item_drawer_favorites.xml
+++ b/app/src/main/res/layout/item_drawer_favorites.xml
@@ -17,7 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:minHeight="?attr/listPreferredItemHeightSmall"
     android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 7500bafc7..715ad11ad 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -27,7 +27,7 @@
         android:contentDescription="@null"
         android:drawSelectorOnTop="true"
         android:scaleType="centerCrop"
-        android:src="@drawable/sadpanda_low_poly" />
+        app:srcCompat="@drawable/sadpanda_low_poly" />
 
     <com.hippo.widget.LoadImageView
         android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/preference_widget_seekbar.xml b/app/src/main/res/layout/preference_widget_seekbar.xml
index bdd523fee..595a3a0f7 100644
--- a/app/src/main/res/layout/preference_widget_seekbar.xml
+++ b/app/src/main/res/layout/preference_widget_seekbar.xml
@@ -20,9 +20,9 @@
     android:background="?android:attr/activatedBackgroundIndicator"
     android:clipToPadding="false"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?attr/listPreferredItemPaddingRight">
 
     <RelativeLayout
         android:layout_width="0dp"
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem" />
+            android:textAppearance="?attr/textAppearanceListItem" />
 
         <TextView
             android:id="@android:id/summary"
@@ -46,7 +46,7 @@
             android:layout_below="@android:id/title"
             android:layout_alignLeft="@android:id/title"
             android:maxLines="10"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textAppearance="?attr/textAppearanceListItemSecondary"
             android:textColor="?android:attr/textColorSecondary" />
 
         <!-- Preference should place its actual preference widget here. -->
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index 9b2732db0..0090dda21 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -37,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:padding="@dimen/keyline_margin"
-                android:src="@mipmap/ic_launcher" />
+                app:srcCompat="@mipmap/ic_launcher" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/username_layout"
@@ -149,7 +149,6 @@
         android:id="@+id/progress"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/translucent_bg"
         android:clickable="true"
         android:visibility="gone">
 
diff --git a/app/src/main/res/layout/scene_warning.xml b/app/src/main/res/layout/scene_warning.xml
index 37d454505..b932cc435 100644
--- a/app/src/main/res/layout/scene_warning.xml
+++ b/app/src/main/res/layout/scene_warning.xml
@@ -77,7 +77,7 @@
 
         <Button
             android:id="@+id/reject"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"