diff --git a/app/src/main/res/drawable-xhdpi/ic_decoration_diamond.webp b/app/src/main/res/drawable-xhdpi/ic_decoration_diamond.webp
deleted file mode 100644
index 748a75da3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_decoration_diamond.webp and /dev/null differ
diff --git a/app/src/main/res/layout/activity_decoration_store.xml b/app/src/main/res/layout/activity_decoration_store.xml
index efb587a17..b63821218 100644
--- a/app/src/main/res/layout/activity_decoration_store.xml
+++ b/app/src/main/res/layout/activity_decoration_store.xml
@@ -47,19 +47,19 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:baselineAligned="true"
         android:background="@color/white"
+        android:baselineAligned="true"
         android:gravity="center_vertical">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             android:drawableStart="@drawable/ic_charge_diamond"
             android:drawablePadding="3dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_activity_decoration_store_01"
-            android:layout_marginStart="15dp"
             android:textColor="@color/color_999999"
             android:textSize="12sp" />
 
@@ -67,9 +67,9 @@
             android:id="@+id/tv_diamond_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="0"
-            android:includeFontPadding="false"
             android:layout_marginStart="4dp"
+            android:includeFontPadding="false"
+            android:text="0"
             android:textColor="#ffffbc51"
             android:textSize="16sp" />
 
@@ -80,14 +80,14 @@
 
         <TextView
             android:id="@+id/tv_charge"
-            android:layout_width="72dp"
-            android:layout_height="24dp"
-            android:text="@string/layout_activity_decoration_store_02"
-            android:background="@drawable/selector_common_confirm"
-            android:gravity="center"
+            android:layout_width="98dp"
+            android:layout_height="38dp"
             android:layout_marginEnd="15dp"
-            android:textColor="@color/white"
-            android:textSize="12sp" />
+            android:background="@drawable/base_shape_theme_24dp"
+            android:gravity="center"
+            android:text="@string/layout_activity_decoration_store_02"
+            android:textColor="@color/color_1E1E1F"
+            android:textSize="16sp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_decoration_common.xml b/app/src/main/res/layout/item_decoration_common.xml
index 2224673c9..b847a6573 100644
--- a/app/src/main/res/layout/item_decoration_common.xml
+++ b/app/src/main/res/layout/item_decoration_common.xml
@@ -60,7 +60,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:drawableStart="@drawable/ic_decoration_diamond"
+        android:drawableStart="@drawable/ic_charge_diamond"
         android:gravity="center"
         android:includeFontPadding="false"
         android:textColor="#ffffbc51"
@@ -72,14 +72,14 @@
     <TextView
         android:id="@+id/tv_send"
         android:layout_width="72dp"
-        android:layout_height="24dp"
+        android:layout_height="29dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@drawable/bg_common_confirm_second_30"
+        android:background="@drawable/base_shape_ffffff_b_1e1e1f_w1dp_22dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_common_03"
-        android:textColor="@color/text_button_color_second"
+        android:textColor="@color/color_1E1E1F"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_buy"
@@ -90,13 +90,13 @@
     <TextView
         android:id="@+id/tv_buy"
         android:layout_width="72dp"
-        android:layout_height="24dp"
+        android:layout_height="29dp"
         android:layout_marginStart="6dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_shape_theme_24dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_common_04"
-        android:textColor="@color/white"
+        android:textColor="@color/color_1E1E1F"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/tv_send"
diff --git a/app/src/main/res/layout/item_decoration_user_card.xml b/app/src/main/res/layout/item_decoration_user_card.xml
index 5ac124584..2154068e2 100644
--- a/app/src/main/res/layout/item_decoration_user_card.xml
+++ b/app/src/main/res/layout/item_decoration_user_card.xml
@@ -79,7 +79,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="12dp"
-        android:drawableStart="@drawable/ic_decoration_diamond"
+        android:drawableStart="@drawable/ic_charge_diamond"
         android:gravity="center"
         android:includeFontPadding="false"
         android:textColor="#ffffbc51"
@@ -94,11 +94,11 @@
         android:layout_height="32dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@drawable/bg_common_confirm_second_30"
+        android:background="@drawable/base_shape_ffffff_b_1e1e1f_w1dp_22dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_user_card_03"
-        android:textColor="@color/text_button_color_second"
+        android:textColor="@color/color_1E1E1F"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_buy"
@@ -111,11 +111,11 @@
         android:layout_width="146dp"
         android:layout_height="32dp"
         android:layout_marginStart="13dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_shape_theme_24dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_user_card_04"
-        android:textColor="@color/white"
+        android:textColor="@color/color_1E1E1F"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/tv_send"
diff --git a/modules/module_base/src/main/res/drawable/base_shape_ffffff_b_1e1e1f_w1dp_22dp.xml b/modules/module_base/src/main/res/drawable/base_shape_ffffff_b_1e1e1f_w1dp_22dp.xml
new file mode 100644
index 000000000..6f9bfd810
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_ffffff_b_1e1e1f_w1dp_22dp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffff" />
+    <stroke
+        android:width="1dp"
+        android:color="#1E1E1F" />
+    <corners android:radius="22dp" />
+</shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml
new file mode 100644
index 000000000..7180ffb6e
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/base_color_theme" />
+    <corners android:radius="24dp" />
+</shape>
\ No newline at end of file