diff --git a/android-app/app/src/main/res/drawable/bg_fishpond_card_16.xml b/android-app/app/src/main/res/drawable/bg_fishpond_card_16.xml
new file mode 100644
index 00000000..8adacd55
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/bg_fishpond_card_16.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#B3F7F2FF" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/android-app/app/src/main/res/drawable/bg_fishpond_center_circle.xml b/android-app/app/src/main/res/drawable/bg_fishpond_center_circle.xml
new file mode 100644
index 00000000..f1c86ba1
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/bg_fishpond_center_circle.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="#7B5CF6" />
+</shape>
diff --git a/android-app/app/src/main/res/drawable/bg_fishpond_fab_circle.xml b/android-app/app/src/main/res/drawable/bg_fishpond_fab_circle.xml
new file mode 100644
index 00000000..b19ec14a
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/bg_fishpond_fab_circle.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="#BFF7F2FF" />
+</shape>
diff --git a/android-app/app/src/main/res/drawable/bg_fishpond_gradient.xml b/android-app/app/src/main/res/drawable/bg_fishpond_gradient.xml
index 9813730a..f5dcebeb 100644
--- a/android-app/app/src/main/res/drawable/bg_fishpond_gradient.xml
+++ b/android-app/app/src/main/res/drawable/bg_fishpond_gradient.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:startColor="#6E5AA6"
-        android:centerColor="#B28AE6"
-        android:endColor="#D8C9FF" />
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="270"
+                android:startColor="#5D4D93"
+                android:centerColor="#B08BE6"
+                android:endColor="#D9C9FF" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:type="radial"
+                android:gradientRadius="220dp"
+                android:centerX="0"
+                android:centerY="0"
+                android:startColor="#66000000"
+                android:endColor="#00000000" />
+        </shape>
+    </item>
+
+</layer-list>
diff --git a/android-app/app/src/main/res/drawable/bg_pill_left.xml b/android-app/app/src/main/res/drawable/bg_pill_left.xml
index a8e36923..97fa09e7 100644
--- a/android-app/app/src/main/res/drawable/bg_pill_left.xml
+++ b/android-app/app/src/main/res/drawable/bg_pill_left.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#66FFFFFF" />
+    <gradient
+        android:angle="270"
+        android:startColor="#E6F2E8FF"
+        android:endColor="#B3FFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="#66FFFFFF" />
     <corners android:radius="22dp" />
 </shape>
diff --git a/android-app/app/src/main/res/drawable/bg_pill_right.xml b/android-app/app/src/main/res/drawable/bg_pill_right.xml
index a8e36923..29f0c94a 100644
--- a/android-app/app/src/main/res/drawable/bg_pill_right.xml
+++ b/android-app/app/src/main/res/drawable/bg_pill_right.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#66FFFFFF" />
+    <gradient
+        android:angle="270"
+        android:startColor="#E6FFE8F3"
+        android:endColor="#B3FFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="#66FFFFFF" />
     <corners android:radius="22dp" />
 </shape>
diff --git a/android-app/app/src/main/res/drawable/ic_globe_24.xml b/android-app/app/src/main/res/drawable/ic_globe_24.xml
new file mode 100644
index 00000000..8eb416ed
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/ic_globe_24.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4.07,13h3.02c0.13,2.03 0.8,3.94 1.83,5.41C6.49,17.38 4.69,15.36 4.07,13zM7.09,11H4.07c0.62,-2.36 2.42,-4.38 4.85,-5.41C7.89,7.06 7.22,8.97 7.09,11zM11,19.93c-1.75,-0.31 -3.26,-2.62 -3.46,-5.93H11v5.93zM11,12H7.54C7.74,8.69 9.25,6.38 11,6.07V12zM19.93,11h-3.02c-0.13,-2.03 -0.8,-3.94 -1.83,-5.41C17.51,6.62 19.31,8.64 19.93,11zM13,6.07c1.75,0.31 3.26,2.62 3.46,5.93H13V6.07zM13,19.93V14h3.46c-0.2,3.31 -1.71,5.62 -3.46,5.93zM15.08,18.41c1.03,-1.47 1.7,-3.38 1.83,-5.41h3.02c-0.62,2.36 -2.42,4.38 -4.85,5.41z"/>
+
+</vector>
diff --git a/android-app/app/src/main/res/layout/activity_fish_pond.xml b/android-app/app/src/main/res/layout/activity_fish_pond.xml
index e3e53edc..df46cf12 100644
--- a/android-app/app/src/main/res/layout/activity_fish_pond.xml
+++ b/android-app/app/src/main/res/layout/activity_fish_pond.xml
@@ -25,7 +25,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="14dp"
-                android:background="@drawable/bg_white_16"
+                android:background="@drawable/bg_fishpond_card_16"
                 android:paddingStart="14dp"
                 android:paddingEnd="14dp"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -100,9 +100,10 @@
                     android:layout_width="92dp"
                     android:layout_height="92dp"
                     android:layout_gravity="center"
-                    android:background="@drawable/bg_purple_circle"
+                    android:background="@drawable/bg_fishpond_center_circle"
+                    android:elevation="10dp"
                     android:padding="22dp"
-                    android:src="@drawable/ic_home_24" />
+                    android:src="@drawable/ic_globe_24" />
 
                 <ImageView
                     android:layout_width="72dp"
@@ -153,7 +154,7 @@
                     android:layout_gravity="bottom|end"
                     android:layout_marginEnd="18dp"
                     android:layout_marginBottom="18dp"
-                    android:background="@drawable/bg_white_circle"
+                    android:background="@drawable/bg_fishpond_fab_circle"
                     android:padding="10dp"
                     android:src="@drawable/ic_grid_24" />
 
@@ -199,6 +200,7 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:src="@drawable/ic_voice_24"
+                            android:tint="#C218F0"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -209,7 +211,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"
                             android:text="语音 ~ 匹配 ~"
-                            android:textColor="#9C27B0"
+                            android:textColor="#C218F0"
                             android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -238,6 +240,7 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:src="@drawable/ic_heart_24"
+                            android:tint="#FF2D77"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -248,7 +251,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"
                             android:text="心动信号 ~"
-                            android:textColor="#E91E63"
+                            android:textColor="#FF2D77"
                             android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -274,9 +277,11 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="6dp"
                             app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp"
+                            app:cardElevation="0dp"
                             app:cardUseCompatPadding="false"
-                            app:cardBackgroundColor="#E6FFFFFF">
+                            app:strokeWidth="1dp"
+                            app:strokeColor="#33FFFFFF"
+                            app:cardBackgroundColor="#CCF7F2FF">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
@@ -320,9 +325,11 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="4dp"
                             app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp"
+                            app:cardElevation="0dp"
                             app:cardUseCompatPadding="false"
-                            app:cardBackgroundColor="#E6FFFFFF">
+                            app:strokeWidth="1dp"
+                            app:strokeColor="#33FFFFFF"
+                            app:cardBackgroundColor="#CCF7F2FF">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
@@ -366,9 +373,11 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="4dp"
                             app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp"
+                            app:cardElevation="0dp"
                             app:cardUseCompatPadding="false"
-                            app:cardBackgroundColor="#E6FFFFFF">
+                            app:strokeWidth="1dp"
+                            app:strokeColor="#33FFFFFF"
+                            app:cardBackgroundColor="#CCF7F2FF">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
@@ -412,9 +421,11 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="4dp"
                             app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp"
+                            app:cardElevation="0dp"
                             app:cardUseCompatPadding="false"
-                            app:cardBackgroundColor="#E6FFFFFF">
+                            app:strokeWidth="1dp"
+                            app:strokeColor="#33FFFFFF"
+                            app:cardBackgroundColor="#CCF7F2FF">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
@@ -458,9 +469,11 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="4dp"
                             app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp"
+                            app:cardElevation="0dp"
                             app:cardUseCompatPadding="false"
-                            app:cardBackgroundColor="#E6FFFFFF">
+                            app:strokeWidth="1dp"
+                            app:strokeColor="#33FFFFFF"
+                            app:cardBackgroundColor="#CCF7F2FF">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
@@ -504,9 +517,11 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="4dp"
                             app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp"
+                            app:cardElevation="0dp"
                             app:cardUseCompatPadding="false"
-                            app:cardBackgroundColor="#E6FFFFFF">
+                            app:strokeWidth="1dp"
+                            app:strokeColor="#33FFFFFF"
+                            app:cardBackgroundColor="#CCF7F2FF">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
diff --git a/android-app/app/src/main/res/layout/activity_profile.xml b/android-app/app/src/main/res/layout/activity_profile.xml
index 1bb074c5..a594e783 100644
--- a/android-app/app/src/main/res/layout/activity_profile.xml
+++ b/android-app/app/src/main/res/layout/activity_profile.xml
@@ -61,71 +61,58 @@
                     app:layout_constraintStart_toEndOf="@id/avatarRing"
                     app:layout_constraintTop_toTopOf="@id/avatarRing" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <LinearLayout
                     android:id="@+id/chipsRow"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="10dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
                     app:layout_constraintEnd_toStartOf="@id/topActionClock"
                     app:layout_constraintStart_toEndOf="@id/avatarRing"
                     app:layout_constraintTop_toBottomOf="@id/name">
 
                     <TextView
                         android:id="@+id/chipLevel"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="24dp"
                         android:background="@drawable/bg_chip_purple"
                         android:gravity="center"
-                        android:ellipsize="end"
                         android:maxLines="1"
                         android:paddingStart="8dp"
                         android:paddingEnd="8dp"
                         android:text="月亮 20"
                         android:textColor="#FFFFFF"
-                        android:textSize="12sp"
-                        app:layout_constraintEnd_toStartOf="@id/chipFans"
-                        app:layout_constraintHorizontal_chainStyle="packed"
-                        app:layout_constraintHorizontal_weight="1"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        android:textSize="12sp" />
 
                     <TextView
                         android:id="@+id/chipFans"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="24dp"
                         android:layout_marginStart="6dp"
                         android:background="@drawable/bg_chip_yellow"
                         android:gravity="center"
-                        android:ellipsize="end"
                         android:maxLines="1"
                         android:paddingStart="8dp"
                         android:paddingEnd="8dp"
                         android:text="星耀 100"
                         android:textColor="#6A3D00"
-                        android:textSize="12sp"
-                        app:layout_constraintEnd_toStartOf="@id/chipBadgeWrap"
-                        app:layout_constraintHorizontal_weight="1"
-                        app:layout_constraintStart_toEndOf="@id/chipLevel"
-                        app:layout_constraintTop_toTopOf="@id/chipLevel" />
+                        android:textSize="12sp" />
 
                     <FrameLayout
                         android:id="@+id/chipBadgeWrap"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="24dp"
                         android:layout_marginStart="6dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_weight="1"
-                        app:layout_constraintStart_toEndOf="@id/chipFans"
-                        app:layout_constraintTop_toTopOf="@id/chipLevel">
+                        >
 
                         <TextView
                             android:id="@+id/chipBadge"
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="24dp"
                             android:background="@drawable/bg_chip_purple"
                             android:gravity="center"
-                            android:ellipsize="end"
                             android:maxLines="1"
                             android:paddingStart="12dp"
                             android:paddingEnd="12dp"
@@ -143,7 +130,7 @@
 
                     </FrameLayout>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/idRow"
diff --git a/android-app/app/src/main/res/layout/item_room_waterfall.xml b/android-app/app/src/main/res/layout/item_room_waterfall.xml
index f977ed40..834b3d07 100644
--- a/android-app/app/src/main/res/layout/item_room_waterfall.xml
+++ b/android-app/app/src/main/res/layout/item_room_waterfall.xml
@@ -49,6 +49,7 @@
             android:layout_margin="8dp"
             android:background="@drawable/viewer_count_background"
             android:gravity="center"
+            android:minWidth="56dp"
             android:orientation="horizontal"
             android:paddingHorizontal="8dp"
             android:paddingVertical="4dp"
@@ -68,6 +69,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
+                android:minEms="3"
                 android:text="0"
                 android:textColor="@android:color/white"
                 android:textSize="10sp" />