diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index 6ba002bfd..8ab151204 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -139,10 +139,6 @@ public final class MainActivity extends StageActivity
     private NavigationView mNavView;
     @Nullable
     private DrawerView mRightDrawer;
-    @Nullable
-    private LoadImageView mAvatar;
-    @Nullable
-    private TextView mDisplayName;
     private int mNavCheckedItem = 0;
 
     @Override
@@ -320,19 +316,6 @@ public final class MainActivity extends StageActivity
         mDrawerLayout.setStatusBarBackgroundColor(0);
         mNavView = (NavigationView) ViewUtils.$$(this, R.id.nav_view);
         mRightDrawer = (DrawerView) ViewUtils.$$(this, R.id.right_drawer);
-        View headerLayout = mNavView.getHeaderView(0);
-        mAvatar = (LoadImageView) ViewUtils.$$(headerLayout, R.id.avatar);
-        mDisplayName = (TextView) ViewUtils.$$(headerLayout, R.id.display_name);
-        ViewUtils.$$(headerLayout, R.id.night_mode).setOnClickListener(v -> {
-            int theme = (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0 ? DayNightDelegate.MODE_NIGHT_NO : DayNightDelegate.MODE_NIGHT_YES;
-            DayNightDelegate.setDefaultNightMode(theme);
-            recreate();
-            if (Settings.getTheme() != AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
-                Settings.putTheme(theme);
-            }
-        });
-
-        updateProfile();
 
         if (mNavView != null) {
             mNavView.setNavigationItemSelectedListener(this);
@@ -440,23 +423,18 @@ public final class MainActivity extends StageActivity
         mDrawerLayout = null;
         mNavView = null;
         mRightDrawer = null;
-        mAvatar = null;
-        mDisplayName = null;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-
         setNavCheckedItem(mNavCheckedItem);
-
         checkClipboardUrl();
     }
 
     @Override
     protected void onTransactScene() {
         super.onTransactScene();
-
         checkClipboardUrl();
     }
 
@@ -546,25 +524,6 @@ public final class MainActivity extends StageActivity
         }
     }
 
-    public void updateProfile() {
-        if (null == mAvatar || null == mDisplayName) {
-            return;
-        }
-
-        String avatarUrl = Settings.getAvatar();
-        if (TextUtils.isEmpty(avatarUrl)) {
-            mAvatar.load(R.drawable.default_avatar);
-        } else {
-            mAvatar.load(avatarUrl, avatarUrl);
-        }
-
-        String displayName = Settings.getDisplayName();
-        if (TextUtils.isEmpty(displayName)) {
-            displayName = getString(R.string.default_display_name);
-        }
-        mDisplayName.setText(displayName);
-    }
-
     public void addAboveSnackView(View view) {
         if (mStageLayout != null) {
             mStageLayout.addAboveSnackView(view);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
index 2cd69f0c8..c6dc7de53 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
@@ -58,13 +58,6 @@ public abstract class BaseScene extends SceneFragment {
     private SparseArray<Parcelable> drawerViewState;
     private boolean needWhiteStatusBar = needWhiteStatusBar();
 
-    public void updateAvatar() {
-        FragmentActivity activity = getActivity();
-        if (activity instanceof MainActivity) {
-            ((MainActivity) activity).updateProfile();
-        }
-    }
-
     public void addAboveSnackView(View view) {
         FragmentActivity activity = getActivity();
         if (activity instanceof MainActivity) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
index 85441c445..df136f19d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
@@ -357,7 +357,6 @@ public final class SignInScene extends SolidScene implements EditText.OnEditorAc
 
     public void onGetProfileEnd() {
         mSigningIn = false;
-        updateAvatar();
         redirectTo();
     }
 
diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml
index a10fb4172..038a2416d 100644
--- a/app/src/main/res/layout/item_gallery_list.xml
+++ b/app/src/main/res/layout/item_gallery_list.xml
@@ -30,6 +30,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.card.MaterialCardView
+            style="@style/Widget.Material3.CardView.Filled"
             android:id="@+id/thumb_card"
             android:layout_width="@dimen/gallery_list_thumb_width"
             android:layout_height="@dimen/gallery_list_thumb_height">
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index b9769e91b..8c18f0831 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -27,41 +27,4 @@
         android:scaleType="centerCrop"
         app:srcCompat="@drawable/sadpanda_low_poly" />
 
-    <com.hippo.widget.LoadImageView
-        android:id="@+id/avatar"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:layout_gravity="bottom"
-        android:layout_marginStart="16dp"
-        android:layout_marginBottom="48dp" />
-
-    <TextView
-        android:id="@+id/display_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginStart="16dp"
-        android:layout_marginBottom="16dp"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/text_small" />
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:background="@android:color/transparent"
-        android:clipToPadding="false"
-        android:padding="8dp">
-
-        <ImageView
-            android:id="@+id/night_mode"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:padding="6dp"
-            app:srcCompat="@drawable/ic_baseline_dark_mode_24"
-            app:tint="#fff" />
-    </FrameLayout>
-
 </FrameLayout>