diff --git a/app/src/main/res/layout-television/gallery_detail_header.xml b/app/src/main/res/layout-television/gallery_detail_header.xml
index 9ecc5fd21..f56c950ad 100644
--- a/app/src/main/res/layout-television/gallery_detail_header.xml
+++ b/app/src/main/res/layout-television/gallery_detail_header.xml
@@ -73,16 +73,18 @@
                 app:fitsSystemWindowsInsets="top">
 
 
-                <RelativeLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/header_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
                     <com.google.android.material.card.MaterialCardView
                         android:id="@+id/thumb_card"
-                        style="@style/Widget.Material3.CardView.Elevated"
+                        style="@style/Widget.Material3.CardView.Filled"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
 
                         <com.hippo.widget.LoadImageView
                             android:id="@+id/thumb"
@@ -96,70 +98,83 @@
                         style="@style/Widget.Material3.CardView.Filled"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
                         android:layout_marginTop="8dp"
                         android:layout_marginEnd="@dimen/keyline_margin"
                         android:clickable="true"
                         android:focusable="true"
                         android:nextFocusRight="@+id/read"
-                        android:orientation="vertical">
+                        android:orientation="vertical"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
 
-                        <TableLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="8dp">
 
-                            <TableRow>
 
-                                <TextView
-                                    android:id="@+id/language"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="left"
-                                    android:singleLine="true" />
+                            <TextView
+                                android:id="@+id/language"
+                                style="@style/TextAppearance.Material3.BodySmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="left"
+                                android:singleLine="true"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
 
-                                <TextView
-                                    android:id="@+id/size"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="right"
-                                    android:singleLine="true" />
+                            <TextView
+                                android:id="@+id/size"
+                                style="@style/TextAppearance.Material3.BodySmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="16dp"
+                                android:gravity="right"
+                                android:singleLine="true"
+                                app:layout_constraintBaseline_toBaselineOf="@id/language"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintHorizontal_bias="1.0"
+                                app:layout_constraintStart_toEndOf="@id/language" />
 
-                            </TableRow>
 
-                            <TableRow android:paddingTop="8dp">
+                            <TextView
+                                android:id="@+id/favoredTimes"
+                                style="@style/TextAppearance.Material3.BodySmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                android:gravity="left"
+                                android:singleLine="true"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@id/language" />
 
-                                <TextView
-                                    android:id="@+id/favoredTimes"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="left"
-                                    android:singleLine="true" />
+                            <TextView
+                                android:id="@+id/pages"
+                                style="@style/TextAppearance.Material3.BodySmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="16dp"
+                                android:gravity="right"
+                                android:singleLine="true"
+                                app:layout_constraintBaseline_toBaselineOf="@id/favoredTimes"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintHorizontal_bias="1.0"
+                                app:layout_constraintStart_toEndOf="@id/favoredTimes" />
 
-                                <TextView
-                                    android:id="@+id/pages"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:singleLine="true" />
 
-                            </TableRow>
+                            <TextView
+                                android:id="@+id/posted"
+                                style="@style/TextAppearance.Material3.BodySmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                android:gravity="left"
+                                android:singleLine="true"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@id/favoredTimes" />
 
-                            <TableRow android:paddingTop="8dp">
 
-                                <TextView
-                                    android:id="@+id/posted"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="left"
-                                    android:singleLine="true" />
-
-                            </TableRow>
-                        </TableLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                     </com.google.android.material.card.MaterialCardView>
 
@@ -168,8 +183,6 @@
                         style="@style/Widget.Material3.Chip.Assist"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignBottom="@id/thumb_card"
-                        android:layout_alignParentEnd="true"
                         android:layout_marginEnd="@dimen/keyline_margin"
                         android:ellipsize="end"
                         android:nextFocusRight="@+id/read"
@@ -177,24 +190,26 @@
                         android:singleLine="true"
                         android:textAllCaps="true"
                         app:chipIcon="@drawable/file_upload_black_24dp"
-                        app:ensureMinTouchTargetSize="true" />
+                        app:ensureMinTouchTargetSize="true"
+                        app:layout_constraintBottom_toBottomOf="@id/thumb_card"
+                        app:layout_constraintEnd_toEndOf="parent" />
 
                     <com.google.android.material.chip.Chip
                         android:id="@+id/category"
                         style="@style/Widget.Material3.Chip.Assist"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_above="@id/uploader"
-                        android:layout_alignParentEnd="true"
                         android:layout_marginEnd="@dimen/keyline_margin"
                         android:ellipsize="end"
+                        android:nextFocusRight="@+id/read"
                         android:singleLine="true"
                         android:textAllCaps="true"
                         app:chipIcon="@drawable/ic_baseline_label_24"
                         app:ensureMinTouchTargetSize="true"
-                        android:nextFocusRight="@+id/read" />
+                        app:layout_constraintBottom_toTopOf="@id/uploader"
+                        app:layout_constraintEnd_toEndOf="parent" />
 
-                </RelativeLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
             </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index f2c44fbfe..5e04a7a41 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -214,19 +214,17 @@
                 style="@style/Widget.Material3.Button.TonalButton"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="4dp"
                 android:layout_weight="1"
                 android:clickable="true"
                 android:focusable="true" />
 
-            <android.widget.Space
-                android:layout_width="8dp"
-                android:layout_height="wrap_content" />
-
             <Button
                 android:id="@+id/read"
                 style="@style/Widget.Material3.Button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="4dp"
                 android:layout_weight="1"
                 android:clickable="true"
                 android:focusable="true"
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index 5ab5020f2..a194454e2 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -95,27 +95,30 @@
                 android:layout_height="wrap_content"
                 android:clipToPadding="false"
                 android:gravity="bottom"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:paddingLeft="12dp"
                 android:paddingTop="4dp"
                 android:paddingRight="12dp"
                 android:paddingBottom="4dp">
 
-                <Button
-                    android:id="@+id/sign_in"
-                    style="@style/Widget.Material3.Button"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/sign_in" />
-
                 <Button
                     android:id="@+id/register"
                     style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="4dp"
                     android:layout_weight="1"
                     android:text="@string/register" />
+
+                <Button
+                    android:id="@+id/sign_in"
+                    style="@style/Widget.Material3.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/sign_in" />
+
             </LinearLayout>
 
             <LinearLayout