diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
index 252b18979..2388416b6 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
@@ -87,12 +87,12 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_03));
             tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
             tvUsed.setEnabled(true);
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_4C5AF1));
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_gray));
         } else {
             tvUsed.setVisibility(View.VISIBLE);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_04));
             tvUsed.setBackgroundResource(R.drawable.selector_common_confirm);
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_title_color));
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_first));
             tvUsed.setEnabled(true);
         }
 
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
index 37d8d5fb6..303527b73 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
@@ -37,8 +37,8 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
         //使用按钮
         TextView tvUsed = helper.getView(R.id.tv_used);
         tvUsed.setBackgroundResource(item.isUsing() ? R.drawable.bg_common_cancel_30 : R.drawable.selector_common_confirm);
-        tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.color_4C5AF1) :
-                mContext.getResources().getColor(R.color.white));
+        tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.text_button_color_gray) :
+                mContext.getResources().getColor(R.color.text_button_color_first));
         tvUsed.setText(item.isUsing() ? R.string.label_used : R.string.label_can_use);
         if (item.isIsExpired()) { // 过期
             // 日期展示
@@ -47,7 +47,7 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
             tvUsed.setEnabled(false);
             tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mynameplateadapter_01));
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_4f516a));
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_gray));
         } else {
             String days;
             if (item.getExpireDays() > 99) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
index 524a61ec5..5a5eb14f5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
@@ -98,10 +98,10 @@ public class PatriarchPwdActivity extends BaseBindingActivity<ActivityPatriarchP
         mBinding.tvCommit.setClickable(canClick);
         if (canClick) {
             mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_confirm_30);
-            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_title_color));
+            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_button_color_first));
         } else {
             mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_cancel_30);
-            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_secondary_4f516a));
+            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_button_color_gray));
         }
     }
 
diff --git a/app/src/main/res/drawable/bg_common_confirm_gray_15.xml b/app/src/main/res/drawable/bg_common_cancel_15.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_common_confirm_gray_15.xml
rename to app/src/main/res/drawable/bg_common_cancel_15.xml
diff --git a/app/src/main/res/drawable/bg_common_cancel_30.xml b/app/src/main/res/drawable/bg_common_cancel_30.xml
index a170e6a5c..736026f2b 100644
--- a/app/src/main/res/drawable/bg_common_cancel_30.xml
+++ b/app/src/main/res/drawable/bg_common_cancel_30.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
+
+    <solid android:color="@color/color_E6E6F0" />
     <corners android:radius="@dimen/dp_30" />
-    <solid android:color="@color/color_E6E6F0"/>
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_confirm_15.xml b/app/src/main/res/drawable/bg_common_confirm_15.xml
index 287cb04c2..4aac819d0 100644
--- a/app/src/main/res/drawable/bg_common_confirm_15.xml
+++ b/app/src/main/res/drawable/bg_common_confirm_15.xml
@@ -4,8 +4,9 @@
 
     <gradient
         android:angle="180"
-        android:endColor="#19EBFF"
-        android:startColor="#ED66FF"
+        android:endColor="#13E2F5"
+        android:centerColor="#9DB4FF"
+        android:startColor="#CC67FF"
         android:type="linear"
         android:useLevel="true" />
     <corners android:radius="@dimen/dp_15" />
diff --git a/app/src/main/res/drawable/bg_common_confirm_30.xml b/app/src/main/res/drawable/bg_common_confirm_30.xml
index f61e22366..109c450fa 100644
--- a/app/src/main/res/drawable/bg_common_confirm_30.xml
+++ b/app/src/main/res/drawable/bg_common_confirm_30.xml
@@ -4,8 +4,9 @@
 
     <gradient
         android:angle="180"
-        android:endColor="#19EBFF"
-        android:startColor="#ED66FF"
+        android:endColor="#13E2F5"
+        android:centerColor="#9DB4FF"
+        android:startColor="#CC67FF"
         android:type="linear"
         android:useLevel="true" />
     <corners android:radius="@dimen/dp_30" />
diff --git a/app/src/main/res/drawable/bg_common_confirm_gray_30.xml b/app/src/main/res/drawable/bg_common_confirm_gray_30.xml
deleted file mode 100644
index 736026f2b..000000000
--- a/app/src/main/res/drawable/bg_common_confirm_gray_30.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/color_E6E6F0" />
-    <corners android:radius="@dimen/dp_30" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_confirm_second_30.xml b/app/src/main/res/drawable/bg_common_confirm_second_30.xml
new file mode 100644
index 000000000..55d4f1b15
--- /dev/null
+++ b/app/src/main/res/drawable/bg_common_confirm_second_30.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:angle="180"
+        android:endColor="#EEDCFF"
+        android:startColor="#CCF8F9"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners android:radius="@dimen/dp_18" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_pk.xml b/app/src/main/res/layout/activity_create_pk.xml
index 80afd72a4..92f0c966a 100644
--- a/app/src/main/res/layout/activity_create_pk.xml
+++ b/app/src/main/res/layout/activity_create_pk.xml
@@ -460,7 +460,7 @@
                 android:background="@drawable/selector_common_confirm"
                 android:gravity="center"
                 android:text="@string/recreate_pk"
-                android:textColor="@color/color_FFFFFF" />
+                android:textColor="@color/text_button_color_first" />
 
 
             <TextView
@@ -473,7 +473,7 @@
                 android:background="@drawable/bg_common_cancel_30"
                 android:gravity="center"
                 android:text="@string/close_pk_mode"
-                android:textColor="@color/text_secondary_4f516a" />
+                android:textColor="@color/text_button_color_gray" />
         </LinearLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_patriarch_mode.xml b/app/src/main/res/layout/activity_patriarch_mode.xml
index 9986da869..88c735911 100644
--- a/app/src/main/res/layout/activity_patriarch_mode.xml
+++ b/app/src/main/res/layout/activity_patriarch_mode.xml
@@ -99,8 +99,8 @@
             android:layout_marginTop="100dp"
             android:gravity="center"
             android:text="@string/layout_activity_patriarch_mode_06"
-            android:background="@drawable/bg_common_cancel_30"
-            android:textColor="@color/color_7154EE"
+            android:background="@drawable/bg_common_confirm_30"
+            android:textColor="@color/text_button_color_first"
             android:textSize="15sp" />
 
 
diff --git a/app/src/main/res/layout/activity_patriarch_pwd.xml b/app/src/main/res/layout/activity_patriarch_pwd.xml
index df8ea0aa0..11879bcbe 100644
--- a/app/src/main/res/layout/activity_patriarch_pwd.xml
+++ b/app/src/main/res/layout/activity_patriarch_pwd.xml
@@ -78,7 +78,7 @@
             android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/layout_activity_patriarch_pwd_02"
-            android:textColor="@color/text_secondary_4f516a"
+            android:textColor="@color/text_button_color_gray"
             android:textSize="15sp"
             />
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_room_title_edit.xml b/app/src/main/res/layout/activity_room_title_edit.xml
index 148785d01..c42c6a36c 100644
--- a/app/src/main/res/layout/activity_room_title_edit.xml
+++ b/app/src/main/res/layout/activity_room_title_edit.xml
@@ -93,11 +93,11 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 android:layout_marginBottom="20dp"
-                android:background="@drawable/selector_common_confirm"
+                android:background="@drawable/bg_common_confirm_30"
                 android:gravity="center"
                 android:text="@string/text_ok"
-                android:textColor="@color/text_title_color"
-                android:textSize="15dp" />
+                android:textColor="@color/text_button_color_first"
+                android:textSize="@dimen/sp_14" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/dialog_buy_decoration.xml b/app/src/main/res/layout/dialog_buy_decoration.xml
index 86f76e95e..bacb0e5cb 100644
--- a/app/src/main/res/layout/dialog_buy_decoration.xml
+++ b/app/src/main/res/layout/dialog_buy_decoration.xml
@@ -27,9 +27,9 @@
         android:layout_width="140dp"
         android:layout_height="38dp"
         android:text="@string/label_common_close"
-        android:textColor="@color/color_7154EE"
+        android:textColor="@color/text_button_color_first"
         android:textSize="15sp"
-        android:background="@drawable/bg_common_cancel_30"
+        android:background="@drawable/bg_common_confirm_30"
         android:gravity="center"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"/>
diff --git a/app/src/main/res/layout/dialog_common_edit.xml b/app/src/main/res/layout/dialog_common_edit.xml
index 6b8073f9f..f9cc20aa3 100644
--- a/app/src/main/res/layout/dialog_common_edit.xml
+++ b/app/src/main/res/layout/dialog_common_edit.xml
@@ -56,7 +56,7 @@
         android:gravity="center"
         android:text="@string/layout_dialog_common_edit_03"
         android:layout_marginEnd="@dimen/dp_5"
-        android:textColor="@color/color_4C5AF1"
+        android:textColor="@color/text_button_color_gray"
         android:textSize="@dimen/sp_15" />
 
     <TextView
@@ -66,8 +66,8 @@
         android:layout_marginStart="12dp"
         android:layout_width="120dp"
         android:layout_height="38dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/bg_common_confirm_30"
         android:gravity="center"
         android:text="@string/layout_dialog_common_edit_04"
-        android:textColor="@color/text_title_color" />
+        android:textColor="@color/text_button_color_first" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_family_join.xml b/app/src/main/res/layout/dialog_family_join.xml
index d0381a94d..43024ca9c 100644
--- a/app/src/main/res/layout/dialog_family_join.xml
+++ b/app/src/main/res/layout/dialog_family_join.xml
@@ -59,7 +59,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_button_color_gray"
             android:background="@drawable/bg_common_cancel_30"
             android:textSize="15sp"
             android:layout_marginEnd="2.5dp"
diff --git a/app/src/main/res/layout/dialog_pk_mic_queue.xml b/app/src/main/res/layout/dialog_pk_mic_queue.xml
index 1018eb3b0..98c89740f 100644
--- a/app/src/main/res/layout/dialog_pk_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_pk_mic_queue.xml
@@ -140,7 +140,7 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:singleLine="true"
-                android:textColor="@color/text_secondary_4f516a"
+                android:textColor="@color/text_button_color_gray"
                 android:textSize="16sp"
                 android:background="@drawable/bg_common_cancel_30"
                 android:text="@string/cancel_mic_queue"
diff --git a/app/src/main/res/layout/dialog_protocol_update.xml b/app/src/main/res/layout/dialog_protocol_update.xml
index 34d783cad..5ab050e41 100644
--- a/app/src/main/res/layout/dialog_protocol_update.xml
+++ b/app/src/main/res/layout/dialog_protocol_update.xml
@@ -55,7 +55,7 @@
                 android:background="@drawable/bg_common_cancel_30"
                 android:gravity="center"
                 android:text="@string/layout_dialog_protocol_update_02"
-                android:textColor="@color/color_7154EE"
+                android:textColor="@color/text_button_color_gray"
                 android:textSize="@dimen/sp_14" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_pub_room_shutup.xml b/app/src/main/res/layout/dialog_pub_room_shutup.xml
index 32d287da1..af28d7fbf 100644
--- a/app/src/main/res/layout/dialog_pub_room_shutup.xml
+++ b/app/src/main/res/layout/dialog_pub_room_shutup.xml
@@ -116,7 +116,7 @@
                     android:background="@drawable/bg_common_cancel_30"
                     android:gravity="center"
                     android:text="@string/cancel"
-                    android:textColor="@color/color_7154EE"
+                    android:textColor="@color/text_button_color_gray"
                     android:textSize="15sp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_request_upmic.xml b/app/src/main/res/layout/dialog_request_upmic.xml
index c538abfb8..044673fd1 100644
--- a/app/src/main/res/layout/dialog_request_upmic.xml
+++ b/app/src/main/res/layout/dialog_request_upmic.xml
@@ -62,11 +62,11 @@
             android:id="@+id/btn_cancel"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_38"
-            android:layout_marginLeft="@dimen/dp_16"
+            android:layout_marginStart="@dimen/dp_16"
             android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_button_color_gray"
             android:textSize="@dimen/sp_14"
             android:onClick="@{click}"
             android:layout_marginTop="12dp"
@@ -80,7 +80,7 @@
             android:layout_height="@dimen/dp_38"
             android:layout_marginLeft="@dimen/dp_16"
             android:layout_marginRight="@dimen/dp_16"
-            android:background="@drawable/common_btn_bg"
+            android:background="@drawable/bg_common_confirm_30"
             android:gravity="center"
             android:onClick="@{click}"
             android:text="@string/ok"
diff --git a/app/src/main/res/layout/dialog_room_pk_received.xml b/app/src/main/res/layout/dialog_room_pk_received.xml
index 309f17f56..84d3498cd 100644
--- a/app/src/main/res/layout/dialog_room_pk_received.xml
+++ b/app/src/main/res/layout/dialog_room_pk_received.xml
@@ -125,7 +125,7 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_08"
-            android:textColor="@color/white"
+            android:textColor="@color/text_button_color_gray"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -136,7 +136,7 @@
             android:layout_width="110dp"
             android:layout_height="35dp"
             android:layout_marginEnd="16dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/bg_common_confirm_30"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_09"
diff --git a/app/src/main/res/layout/dialog_task.xml b/app/src/main/res/layout/dialog_task.xml
index 049a376ca..525b882bf 100644
--- a/app/src/main/res/layout/dialog_task.xml
+++ b/app/src/main/res/layout/dialog_task.xml
@@ -32,9 +32,9 @@
             android:text="@string/close"
             android:layout_marginTop="13dp"
             android:layout_marginBottom="17dp"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_button_color_first"
             android:layout_gravity="center_horizontal"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/bg_common_confirm_30"
             android:textSize="15sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_dialog_room_title.xml b/app/src/main/res/layout/fragment_dialog_room_title.xml
index 532fab674..91682b04c 100644
--- a/app/src/main/res/layout/fragment_dialog_room_title.xml
+++ b/app/src/main/res/layout/fragment_dialog_room_title.xml
@@ -20,8 +20,8 @@
             android:layout_marginLeft="20dp"
             android:gravity="center"
             android:layout_centerHorizontal="true"
-            android:textSize="16dp"
-            android:textColor="@color/appColor"
+            android:textSize="@dimen/sp_16"
+            android:textColor="@color/text_title_color"
             tools:text="@string/layout_fragment_dialog_room_title_01" />
 
         <TextView
@@ -34,20 +34,20 @@
             android:layout_width="match_parent"
             android:layout_height="205dp"
             android:textColor="@color/color_424242"
-            android:textSize="13dp"
+            android:textSize="@dimen/sp_13"
             android:scrollbars="vertical" />
 
         <TextView
             android:id="@+id/tv_close"
             android:layout_width="140dp"
             android:layout_height="38dp"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_button_color_second"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:text="@string/close"
             android:gravity="center"
             android:layout_marginBottom="15dp"
-            android:background="@drawable/bg_common_cancel_30" />
+            android:background="@drawable/bg_common_confirm_second_30" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/item_decoration_common.xml b/app/src/main/res/layout/item_decoration_common.xml
index e9bf8002c..2224673c9 100644
--- a/app/src/main/res/layout/item_decoration_common.xml
+++ b/app/src/main/res/layout/item_decoration_common.xml
@@ -75,11 +75,11 @@
         android:layout_height="24dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@drawable/bg_common_cancel_30"
+        android:background="@drawable/bg_common_confirm_second_30"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_common_03"
-        android:textColor="@color/color_FFA957"
+        android:textColor="@color/text_button_color_second"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_buy"
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 6ff6b650e..5ac124584 100644
--- a/app/src/main/res/layout/item_decoration_user_card.xml
+++ b/app/src/main/res/layout/item_decoration_user_card.xml
@@ -94,11 +94,11 @@
         android:layout_height="32dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@drawable/bg_common_cancel_30"
+        android:background="@drawable/bg_common_confirm_second_30"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_user_card_03"
-        android:textColor="@color/color_FFA957"
+        android:textColor="@color/text_button_color_second"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_buy"
diff --git a/app/src/main/res/layout/item_my_chat_bubble.xml b/app/src/main/res/layout/item_my_chat_bubble.xml
index f674fc859..71cc1f6c0 100644
--- a/app/src/main/res/layout/item_my_chat_bubble.xml
+++ b/app/src/main/res/layout/item_my_chat_bubble.xml
@@ -81,7 +81,7 @@
             android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.hasUsed ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.hasUsed ? @color/color_4C5AF1 : @color/white}"
+            android:textColor="@{headWearInfo.hasUsed ? @color/text_button_color_gray : @color/white}"
             android:textSize="14sp"
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/tv_counters"
diff --git a/app/src/main/res/layout/item_my_head_wear.xml b/app/src/main/res/layout/item_my_head_wear.xml
index f164aea60..f70572df8 100644
--- a/app/src/main/res/layout/item_my_head_wear.xml
+++ b/app/src/main/res/layout/item_my_head_wear.xml
@@ -64,12 +64,12 @@
             android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/text_title_color}"
+            android:textColor="@{headWearInfo.used ? @color/text_button_color_gray : @color/text_button_color_first}"
             android:textSize="14sp"
             android:visibility="gone"
             tools:background="@drawable/selector_common_confirm"
             tools:text="@string/label_can_use"
-            tools:textColor="@color/text_title_color"
+            tools:textColor="@color/text_button_color_first"
             tools:visibility="visible" />
 
 
diff --git a/app/src/main/res/layout/item_my_user_card_wear.xml b/app/src/main/res/layout/item_my_user_card_wear.xml
index 7814d7a70..73da87258 100644
--- a/app/src/main/res/layout/item_my_user_card_wear.xml
+++ b/app/src/main/res/layout/item_my_user_card_wear.xml
@@ -75,7 +75,7 @@
             android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/white}"
+            android:textColor="@{headWearInfo.used ? @color/text_button_color_gray : @color/white}"
             android:textSize="14sp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/layout_agree_apply_dialog.xml b/app/src/main/res/layout/layout_agree_apply_dialog.xml
index cd93e0186..40797b05c 100644
--- a/app/src/main/res/layout/layout_agree_apply_dialog.xml
+++ b/app/src/main/res/layout/layout_agree_apply_dialog.xml
@@ -60,7 +60,7 @@
             android:layout_width="110dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_28"
-            android:background="@drawable/bg_common_confirm_gray_30"
+            android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/color_B3B3C3"
diff --git a/app/src/main/res/layout/layout_close_exchange_dialog.xml b/app/src/main/res/layout/layout_close_exchange_dialog.xml
index c18fcc7a2..3ca34ef7e 100644
--- a/app/src/main/res/layout/layout_close_exchange_dialog.xml
+++ b/app/src/main/res/layout/layout_close_exchange_dialog.xml
@@ -76,7 +76,7 @@
             android:layout_width="110dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_28"
-            android:background="@drawable/bg_common_confirm_gray_30"
+            android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/color_B3B3C3"
diff --git a/app/src/main/res/layout/layout_ok_cancel_dialog.xml b/app/src/main/res/layout/layout_ok_cancel_dialog.xml
index 8d8d588c3..e1c7e73d5 100644
--- a/app/src/main/res/layout/layout_ok_cancel_dialog.xml
+++ b/app/src/main/res/layout/layout_ok_cancel_dialog.xml
@@ -41,7 +41,7 @@
             android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_button_color_gray"
             android:textSize="15sp" />
 
         <TextView
diff --git a/app/src/main/res/layout/layout_pic_login_dialog.xml b/app/src/main/res/layout/layout_pic_login_dialog.xml
index 7e3a237e0..e2d226f43 100644
--- a/app/src/main/res/layout/layout_pic_login_dialog.xml
+++ b/app/src/main/res/layout/layout_pic_login_dialog.xml
@@ -98,7 +98,7 @@
             android:layout_height="38dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_button_color_gray"
             android:layout_marginEnd="@dimen/dp_16"
             android:background="@drawable/bg_common_cancel_30"
             android:textSize="15sp" />
diff --git a/app/src/main/res/layout/layout_refuse_apply_dialog.xml b/app/src/main/res/layout/layout_refuse_apply_dialog.xml
index 2cd6c63be..439d429b4 100644
--- a/app/src/main/res/layout/layout_refuse_apply_dialog.xml
+++ b/app/src/main/res/layout/layout_refuse_apply_dialog.xml
@@ -75,7 +75,7 @@
             android:layout_width="110dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_28"
-            android:background="@drawable/bg_common_confirm_gray_30"
+            android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/color_B3B3C3"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 00ba21b01..3e8880722 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -570,7 +570,7 @@
     <!-- 输入框背景颜色 -->
     <color name="bg_edit_e8e8f6">#E8E8F6</color>
     <!-- 标题文字颜色 -->
-    <color name="text_title_color">#1F1A4E</color>
+    <color name="text_title_color">#171A58</color>
     <!-- 常用文字颜色 -->
     <color name="text_normal_c6c6e9">#FF333333</color>
     <!-- 日期等次级文案 -->
@@ -591,7 +591,12 @@
     <color name="color_5caaff">#5CAAFF</color>
     <!-- 首页tab未选中颜色 -->
     <color name="main_tab_normal">#66333333</color>
-
+    <!-- 按钮文字颜色一级 -->
+    <color name="text_button_color_first">#FFFFFF</color>
+    <!-- 按钮文字颜色二级 -->
+    <color name="text_button_color_second">#9168FA</color>
+    <!-- 按钮文字颜色置灰 -->
+    <color name="text_button_color_gray">#B3B3C3</color>
 
     <!-- PekoUI规范 end-->
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4257c53b2..aefa884d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1541,7 +1541,7 @@
     <string name="avroom_fragment_roomcharmrankinglistfragment_01">房間</string>
     <string name="avroom_fragment_roomrankdialogutils_01">萬</string>
     <string name="avroom_fragment_roomtitledialogfragment_01">房間公告</string>
-    <string name="avroom_fragment_roomtitledialogfragment_02">這個房主很懶喲...</string>
+    <string name="avroom_fragment_roomtitledialogfragment_02">這個房主很懶喲…</string>
     <string name="avroom_newuserchargegift_newuserchargegiftdialog_01">新人專享禮物彈窗充值點擊</string>
     <string name="avroom_newuserchargegift_newuserchargeprizedialog_01">新人專享禮物彈窗充值完成後彈窗</string>
     <string name="avroom_presenter_avroompresenter_01">區分房間類型:</string>
diff --git a/app/src/module_community/res/layout/dialog_dating_select.xml b/app/src/module_community/res/layout/dialog_dating_select.xml
index 0da6b7e74..4fa135136 100644
--- a/app/src/module_community/res/layout/dialog_dating_select.xml
+++ b/app/src/module_community/res/layout/dialog_dating_select.xml
@@ -53,17 +53,17 @@
                 android:background="@drawable/bg_common_cancel_30"
                 android:gravity="center"
                 android:text="@string/cancel"
-                android:textColor="@color/color_7154EE"
+                android:textColor="@color/text_button_color_gray"
                 android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/btn_ok"
                 android:layout_width="80dp"
                 android:layout_height="28dp"
-                android:background="@drawable/selector_common_confirm"
+                android:background="@drawable/bg_common_confirm_30"
                 android:gravity="center"
                 android:text="@string/text_ok"
-                android:textColor="@color/white"
+                android:textColor="@color/text_button_color_first"
                 android:textSize="15sp" />
         </LinearLayout>
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt
index 0dcfd47d6..1672bd6f7 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt
@@ -30,7 +30,7 @@ class EnableExchangeAdapter :
         )
         helper.getView<AppCompatTextView>(R.id.tv_confirm).background = ContextCompat.getDrawable(
             mContext,
-            R.drawable.bg_common_confirm_gray_15
+            R.drawable.bg_common_cancel_15
         )
         helper.setText(R.id.tv_confirm, mContext.getString(R.string.close_exchange))
             .setTextColor(R.id.tv_confirm, ContextCompat.getColor(mContext, R.color.color_B3B3C3))
diff --git a/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml b/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
index cf995d7da..f3749abaa 100644
--- a/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
+++ b/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
@@ -30,10 +30,10 @@
         android:layout_height="38dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"
-        android:background="@drawable/bg_common_cancel_30"
+        android:background="@drawable/bg_common_confirm_30"
         android:gravity="center"
         android:text="@string/label_common_close"
-        android:textColor="@color/appColor"
+        android:textColor="@color/text_button_color_first"
         android:textSize="15sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
index 18ab94a02..1dba0540d 100644
--- a/library/src/main/res/values/colors.xml
+++ b/library/src/main/res/values/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="color_white">#FFFFFF</color>
+    <color name="color_B3B3C3">#B3B3C3</color>
 </resources>
diff --git a/library/src/module_easypermission/res/drawable/bg_common_cancel.xml b/library/src/module_easypermission/res/drawable/bg_common_cancel.xml
index 760a11915..ff31d7ae0 100644
--- a/library/src/module_easypermission/res/drawable/bg_common_cancel.xml
+++ b/library/src/module_easypermission/res/drawable/bg_common_cancel.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="100dp" />
-    <gradient
-        android:angle="180"
-        android:endColor="#4DFFA936"
-        android:startColor="#4DFFCB47"
-        android:type="linear"
-        android:useLevel="true" />
+    <corners android:radius="30dp" />
+    <solid android:color="#E6E6F0" />
 </shape>
\ No newline at end of file
diff --git a/library/src/module_easypermission/res/drawable/bg_common_confirm_normal.xml b/library/src/module_easypermission/res/drawable/bg_common_confirm_normal.xml
index 060b3dcd8..1e799d5c6 100644
--- a/library/src/module_easypermission/res/drawable/bg_common_confirm_normal.xml
+++ b/library/src/module_easypermission/res/drawable/bg_common_confirm_normal.xml
@@ -4,10 +4,11 @@
 
     <gradient
         android:angle="180"
-        android:endColor="#19EBFF"
-        android:startColor="#ED66FF"
+        android:endColor="#13E2F5"
+        android:centerColor="#9DB4FF"
+        android:startColor="#CC67FF"
         android:type="linear"
         android:useLevel="true" />
-    <corners android:radius="28dp" />
+    <corners android:radius="30dp" />
 
 </shape>
\ No newline at end of file
diff --git a/library/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml b/library/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml
index 447742d3c..79e0c22ad 100644
--- a/library/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml
+++ b/library/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml
@@ -36,7 +36,7 @@
             android:background="@drawable/bg_common_cancel"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/color_B3B3C3"
             android:textSize="15sp" />
 
         <Button