diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java
index 0ad37a6f8c..961a873b41 100644
--- a/app/src/main/java/com/gh/common/util/LibaoUtils.java
+++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java
@@ -176,7 +176,7 @@ public class LibaoUtils {
                 break;
             case "coming":
                 libaoBtn.setText(R.string.libao_coming);
-                libaoBtn.setBackgroundResource(R.drawable.bg_shape_f5_radius_999);
+                libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light);
                 libaoBtn.setTextColor(context.getResources().getColor(R.color.text_subtitleDesc));
                 break;
             case "used_up":
@@ -191,7 +191,7 @@ public class LibaoUtils {
                 break;
             case "linged":
                 libaoBtn.setText(R.string.libao_linged);
-                libaoBtn.setBackgroundResource(R.drawable.bg_shape_f5_radius_999);
+                libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light);
                 libaoBtn.setTextColor(context.getResources().getColor(R.color.text_subtitleDesc));
                 break;
             case "taoed":
diff --git a/app/src/main/java/com/gh/common/view/DownloadButton.kt b/app/src/main/java/com/gh/common/view/DownloadButton.kt
index 4210ee75aa..3074da2143 100644
--- a/app/src/main/java/com/gh/common/view/DownloadButton.kt
+++ b/app/src/main/java/com/gh/common/view/DownloadButton.kt
@@ -176,7 +176,7 @@ class DownloadButton @JvmOverloads constructor(
             ButtonStyle.NONE,
             ButtonStyle.RESERVED -> {
                 progressDrawable = null
-                background = R.drawable.bg_shape_f5_radius_999.toDrawable(context)
+                background = R.drawable.button_round_gray_light.toDrawable(context)
                 progress = 0
                 mDefaultColor = R.color.text_subtitleDesc.toColor(context)
             }
diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
index e9481040b0..af49db576a 100644
--- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
+++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
@@ -186,7 +186,7 @@ public class DownloadProgressBar extends ProgressBar {
                 setProgress(0);
                 break;
             case NONE:
-                setProgressDrawable(getResources().getDrawable(R.drawable.bg_shape_f5_radius_999));
+                setProgressDrawable(getResources().getDrawable(R.drawable.button_round_gray_light));
                 mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_subtitleDesc);
                 setProgress(0);
                 break;
@@ -222,7 +222,7 @@ public class DownloadProgressBar extends ProgressBar {
                 mDefaultColor = ContextCompat.getColor(getContext(), R.color.white);
                 break;
             case RESERVED:
-                setProgressDrawable(getResources().getDrawable(R.drawable.bg_shape_f5_radius_999));
+                setProgressDrawable(getResources().getDrawable(R.drawable.button_round_gray_light));
                 mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_subtitleDesc);
                 break;
             case XAPK_FAILURE:
diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt
index 730ebe7cb8..8fe56a43ac 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt
@@ -381,7 +381,7 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable {
             }
             mBinding.followTv.setTextColor(ContextCompat.getColor(requireContext(), if (me.isFollower) R.color.text_subtitleDesc else R.color.white))
             mBinding.followTv.background =
-                ContextCompat.getDrawable(requireContext(), if (me.isFollower) R.drawable.bg_shape_f5_radius_999 else R.drawable.download_button_normal_style)
+                ContextCompat.getDrawable(requireContext(), if (me.isFollower) R.drawable.button_round_gray_light else R.drawable.download_button_normal_style)
             mBinding.allOrderSfv.setItemList(mAllOrderList, 0)
             mBinding.videoOrderSfv.setItemList(mVideoOrderList, 0)
 
diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt
index d7f4f617ab..8bffe19920 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt
@@ -67,7 +67,7 @@ class ForumListAdapter(
 
                         followTv.run {
                             text = if (forumEntity.me.isFollowForum) {
-                                setBackgroundResource(R.drawable.bg_shape_f5_radius_999)
+                                setBackgroundResource(R.drawable.button_round_gray_light)
                                 setTextColor(R.color.text_subtitleDesc.toColor(mContext))
                                 "已关注"
                             } else {
@@ -91,7 +91,7 @@ class ForumListAdapter(
                                     } else {
                                         mViewModel?.followForum(forumEntity.id) {
                                             forumEntity.me.isFollowForum = true
-                                            followTv.setBackgroundResource(R.drawable.bg_shape_f5_radius_999)
+                                            followTv.setBackgroundResource(R.drawable.button_round_gray_light)
                                             followTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext))
                                             followTv.text = "已关注"
                                             ToastUtils.showToast("关注成功")
diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt
index a2a3650182..d0e4969a8e 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt
@@ -43,7 +43,7 @@ class ModeratorListAdapter(context: Context, val mViewModel: ModeratorListViewMo
                 labelTv.text = personalEntity.nameLabel
                 labelTv.visibility = if (mHasNameLabel) View.VISIBLE else View.GONE
                 followTv.background =
-                    if (personalEntity.me.isFollower) R.drawable.bg_shape_f5_radius_999.toDrawable(mContext) else R.drawable.bg_forum_follow.toDrawable(mContext)
+                    if (personalEntity.me.isFollower) R.drawable.button_round_gray_light.toDrawable(mContext) else R.drawable.bg_forum_follow.toDrawable(mContext)
                 followTv.text = if (personalEntity.me.isFollower) "已关注" else "关注"
                 followTv.setTextColor(if (personalEntity.me.isFollower) R.color.text_subtitleDesc.toColor(mContext) else R.color.theme_font.toColor(mContext))
 
diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt
index 70ba949a5f..f12e36b66d 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt
@@ -72,14 +72,14 @@ class UserSearchListAdapter(context: Context, val mEntrance: String, val mViewMo
                 binding.userSignatureTv.text = if (entity.introduce.isNullOrEmpty()) "这是一个很神秘的崽~" else entity.introduce
                 binding.userFansCountTv.text = "${entity.count.fans} 粉丝"
                 binding.attentionTv.background =
-                    if (entity.me.isFollower) R.drawable.bg_shape_f5_radius_999.toDrawable(mContext) else R.drawable.bg_forum_follow.toDrawable(mContext)
+                    if (entity.me.isFollower) R.drawable.button_round_gray_light.toDrawable(mContext) else R.drawable.bg_forum_follow.toDrawable(mContext)
                 binding.attentionTv.text = if (entity.me.isFollower) "已关注" else "关注"
                 binding.attentionTv.setTextColor(if (entity.me.isFollower) R.color.text_subtitleDesc.toColor(mContext) else R.color.theme_font.toColor(mContext))
                 if (entity.id == UserManager.getInstance().userId) {
                     binding.attentionTv.text = "自己"
                     binding.attentionTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc))
                     binding.attentionTv.background =
-                        ContextCompat.getDrawable(mContext, R.drawable.bg_shape_f5_radius_999)
+                        ContextCompat.getDrawable(mContext, R.drawable.button_round_gray_light)
                     binding.attentionTv.isEnabled = false
                 }
                 holder.itemView.setOnClickListener {
diff --git a/app/src/main/java/com/gh/gamecenter/forum/select/ForumAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/select/ForumAdapter.kt
index afebfd3d1d..5b139f0156 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/select/ForumAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/select/ForumAdapter.kt
@@ -45,7 +45,7 @@ class ForumAdapter(
             val forumEntity = datas[position]
             holder.binding.forumNameTv.text = forumEntity.name.fromHtml()
             holder.binding.followTv.background =
-                if (forumEntity.isFollow) R.drawable.bg_shape_f5_radius_999.toDrawable(mContext) else R.drawable.bg_forum_follow.toDrawable(mContext)
+                if (forumEntity.isFollow) R.drawable.button_round_gray_light.toDrawable(mContext) else R.drawable.bg_forum_follow.toDrawable(mContext)
             holder.binding.followTv.text = if (forumEntity.isFollow) "已关注" else "关注"
             holder.binding.followTv.setTextColor(if (forumEntity.isFollow) R.color.text_subtitleDesc.toColor(mContext) else R.color.theme_font.toColor(mContext))
 
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt
index 4d2e8b824e..4e296683fe 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt
@@ -40,7 +40,7 @@ class AddSearchAndPlayedGameAdapter(context: Context, val mChooseGamesViewModel:
             holder.bindGameItem(entity)
             holder.binding.downloadBtn.text = if (isSelected) "删除" else "添加"
             holder.binding.downloadBtn.background =
-                if (isSelected) R.drawable.bg_shape_f5_radius_999.toDrawable(mContext) else R.drawable.download_button_normal_style.toDrawable(mContext)
+                if (isSelected) R.drawable.button_round_gray_light.toDrawable(mContext) else R.drawable.download_button_normal_style.toDrawable(mContext)
             holder.binding.downloadBtn.setTextColor(if (isSelected) R.color.text_subtitleDesc.toColor(mContext) else R.color.white.toColor(mContext))
 
             holder.binding.downloadBtn.setOnClickListener {
diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt
index 9e3eaac432..6890886060 100644
--- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt
@@ -183,7 +183,7 @@ class MyFollowedGameViewHolder(var binding: ItemFollowedGameBinding) : RecyclerV
             } else {
                 gameItemIncluded.downloadBtn.text = "已关注"
                 gameItemIncluded.downloadBtn.setTextColor(R.color.text_subtitleDesc.toColor(root.context))
-                gameItemIncluded.downloadBtn.background = R.drawable.bg_shape_f5_radius_999.toDrawable(root.context)
+                gameItemIncluded.downloadBtn.background = R.drawable.button_round_gray_light.toDrawable(root.context)
 
                 gameItemIncluded.downloadBtn.setOnClickListener {
                     NewFlatLogUtils.logMyGameFollowTabGameCardClick(
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt
index 75bb753a64..3d549b7c85 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt
@@ -68,12 +68,12 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi
                 when {
                     entity.id == UserManager.getInstance().userId -> {
                         setText(R.string.myself)
-                        background = R.drawable.bg_shape_f5_radius_999.toDrawable(mContext)
+                        background = R.drawable.button_round_gray_light.toDrawable(mContext)
                         setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc))
                     }
                     entity?.me?.isFollower!! -> {
                         setText(R.string.concerned)
-                        background = R.drawable.bg_shape_f5_radius_999.toDrawable(mContext)
+                        background = R.drawable.button_round_gray_light.toDrawable(mContext)
                         setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc))
                     }
                     else -> {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt
index 26b3f856f9..121d3edd18 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt
@@ -63,7 +63,7 @@ class ChooseForumContainerAdapter(
             val forumEntity = mEntityList[position]
             holder.binding.forumNameTv.text = forumEntity.name.fromHtml()
             holder.binding.followTv.background =
-                if (forumEntity.isFollow) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.bg_forum_follow.toDrawable()
+                if (forumEntity.isFollow) R.drawable.button_round_gray_light.toDrawable() else R.drawable.bg_forum_follow.toDrawable()
             holder.binding.followTv.text = if (forumEntity.isFollow) "已关注" else "关注"
             holder.binding.followTv.setTextColor(if (forumEntity.isFollow) R.color.text_subtitleDesc.toColor(mContext) else R.color.theme_font.toColor(mContext))
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
index 03cde35bca..1162f650ff 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
@@ -45,7 +45,7 @@ class VideoDescTopViewHolder(
             goneIf(entity.user.id == UserManager.getInstance().userId)
             text = if (entity.me.isFollower) "已关注" else "关注"
             background =
-                if (entity.me.isFollower) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.button_round_primary_light.toDrawable()
+                if (entity.me.isFollower) R.drawable.button_round_gray_light.toDrawable() else R.drawable.button_round_primary_light.toDrawable()
             setTextColor(if (entity.me.isFollower) R.color.text_subtitleDesc.toColor() else R.color.theme_font.toColor())
         }
         binding.titleTv.text = entity.title
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index d85c7494b7..aae24ee00d 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -350,7 +350,7 @@
 
     <!-- 负向浅色按钮 -->
     <style name="NegativeButton">
-        <item name="android:background">@drawable/bg_shape_f5_radius_999</item>
+        <item name="android:background">@drawable/button_round_gray_light</item>
         <item name="android:textColor">@color/text_subtitleDesc</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f4f31a022d..7606aca04f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -350,7 +350,7 @@
 
     <!-- 负向浅色按钮 -->
     <style name="NegativeButton">
-        <item name="android:background">@drawable/bg_shape_f5_radius_999</item>
+        <item name="android:background">@drawable/button_round_gray_light</item>
         <item name="android:textColor">@color/text_subtitleDesc</item>
     </style>