diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
index f0ad72c3e2..a6c87c5e87 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
@@ -5,6 +5,7 @@ import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
@@ -252,6 +253,12 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
                 mTabTitleList.add(tabViewBinding.tabTitle)
                 tab.customView = tabViewBinding.root
                 tab.view.setPadding(0, 0, 0, 0)
+                if (i == 0) {
+                    tab.view.layoutParams = (tab.view.layoutParams as LinearLayout.LayoutParams).apply { setMargins(10F.dip2px(), 0, 0, 0) }
+                }
+                if (i == mBinding?.tabLayout?.tabCount!! - 1) {
+                    tab.view.layoutParams = (tab.view.layoutParams as LinearLayout.LayoutParams).apply { setMargins(0, 0, 10F.dip2px(), 0) }
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt
index 69353fa586..8ea8154468 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt
@@ -18,7 +18,8 @@ class GameCollectionTagAdapter(
     val singleChoice: Boolean = true,
     val maxSelectCount: Int = 1,
     val singleSelectedTag: TagInfoEntity? = null,
-    private val updateCallback: (() -> Unit)
+    private val updateCallback: (() -> Unit),
+    private val singleClickCallback: (() -> Unit)? = null
 ) :
     BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
 
@@ -108,9 +109,7 @@ class GameCollectionTagAdapter(
             if (tagTv.isChecked) {
                 selectedTagEntity = tag
                 selectedTagCategory = tagCategory
-            } else {
-                selectedTagEntity = null
-                selectedTagCategory = ""
+                singleClickCallback?.invoke()
             }
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
index 97804fe312..d2fb642763 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
@@ -12,7 +12,9 @@ class GameCollectionTagSelectActivity : NormalActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle("选择标签")
-        setToolbarMenu(R.menu.menu_save)
+        if (intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_SINGLE_CHOICE) == false) {
+            setToolbarMenu(R.menu.menu_save)
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt
index 9140e8f76c..6933d0ad07 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt
@@ -55,18 +55,10 @@ class GameCollectionTagSelectFragment : NormalFragment() {
 
     override fun onMenuItemClick(menuItem: MenuItem?) {
         if (menuItem?.itemId == R.id.layout_menu_save) {
-            if (mSingleChoice) {
-                if (mAdapter.selectedTagEntity != null) {
-                    NewLogUtils.logFilterGameCollectionTag(mAdapter.selectedTagCategory, mAdapter.selectedTagEntity!!.name)
-                }
+            if (!mSingleChoice) {
                 requireActivity().setResult(
-                    Activity.RESULT_OK,
-                    Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntity)
-                )
-            } else {
-                requireActivity().setResult(
-                    Activity.RESULT_OK,
-                    Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntityList)
+                        Activity.RESULT_OK,
+                        Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntityList)
                 )
             }
             requireActivity().finish()
@@ -79,7 +71,16 @@ class GameCollectionTagSelectFragment : NormalFragment() {
         mSelectedTag = arguments?.getParcelable(GameCollectionTagSelectActivity.KEY_SINGLE_SELECTED_TAG)
         mMaxSelectCount = arguments?.getInt(GameCollectionTagSelectActivity.KEY_MAX_SELECT_COUNT_TAG, 1) ?: 1
         mSelectedTags = arguments?.getParcelableArrayList(GameCollectionTagSelectActivity.KEY_SELECT_TAGS) ?: arrayListOf()
-        mAdapter = GameCollectionTagAdapter(requireContext(), mSingleChoice, mMaxSelectCount, mSelectedTag, updateSelectedTagView)
+        mAdapter = GameCollectionTagAdapter(requireContext(), mSingleChoice, mMaxSelectCount, mSelectedTag, updateSelectedTagView, {
+            if (mAdapter.selectedTagEntity != null) {
+                NewLogUtils.logFilterGameCollectionTag(mAdapter.selectedTagCategory, mAdapter.selectedTagEntity!!.name)
+            }
+            requireActivity().setResult(
+                    Activity.RESULT_OK,
+                    Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntity)
+            )
+            requireActivity().finish()
+        })
         if (!mSelectedTags.isNullOrEmpty()) {
             mAdapter.selectedTagEntityList.addAll(mSelectedTags!!)
         }
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_game_collection_amway.webp b/app/src/main/res/drawable-xxxhdpi/bg_game_collection_amway.webp
new file mode 100644
index 0000000000..e70058975c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_game_collection_amway.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/game_collection_square_head.webp b/app/src/main/res/drawable-xxxhdpi/game_collection_square_head.webp
index 5ad4777985..6532450a91 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/game_collection_square_head.webp and b/app/src/main/res/drawable-xxxhdpi/game_collection_square_head.webp differ
diff --git a/app/src/main/res/drawable/bg_game_collection_amway_game_icon.xml b/app/src/main/res/drawable/bg_game_collection_amway_game_icon.xml
new file mode 100644
index 0000000000..617107fb4c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_game_collection_amway_game_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/background" />
+    <corners android:radius="3dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_game_collection_game_icon.xml b/app/src/main/res/drawable/bg_game_collection_game_icon.xml
new file mode 100644
index 0000000000..546740ef6f
--- /dev/null
+++ b/app/src/main/res/drawable/bg_game_collection_game_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progressbar_game_collection.xml b/app/src/main/res/drawable/progressbar_game_collection.xml
index f36ccf6bc0..071c3740a2 100644
--- a/app/src/main/res/drawable/progressbar_game_collection.xml
+++ b/app/src/main/res/drawable/progressbar_game_collection.xml
@@ -9,12 +9,9 @@
     </item>
 
     <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <corners android:radius="999dip" />
-                <solid android:color="#FFFFFF" />
-            </shape>
-        </clip>
+        <scale
+            android:drawable="@drawable/progressbar_game_collection_primary"
+            android:scaleWidth="100%" />
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progressbar_game_collection_primary.xml b/app/src/main/res/drawable/progressbar_game_collection_primary.xml
new file mode 100644
index 0000000000..7f44f970bd
--- /dev/null
+++ b/app/src/main/res/drawable/progressbar_game_collection_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="999dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/game_collection_amway_content_item.xml b/app/src/main/res/layout/game_collection_amway_content_item.xml
index 9e8d4c264a..e53cc09beb 100644
--- a/app/src/main/res/layout/game_collection_amway_content_item.xml
+++ b/app/src/main/res/layout/game_collection_amway_content_item.xml
@@ -16,12 +16,19 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <com.gh.common.view.GameIconView
-            android:id="@+id/gameIcon"
-            game="@{entity.game.toGameEntity}"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            app:gameIconCornerRadius="4dp" />
+        <FrameLayout
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:background="@drawable/bg_game_collection_amway_game_icon">
+
+            <com.gh.common.view.GameIconView
+                android:id="@+id/gameIcon"
+                game="@{entity.game.toGameEntity}"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center"
+                app:gameIconCornerRadius="3dp" />
+        </FrameLayout>
 
         <TextView
             android:id="@+id/amwayTv"
diff --git a/app/src/main/res/layout/game_collection_square_amway_item.xml b/app/src/main/res/layout/game_collection_square_amway_item.xml
index 2bc937e1b9..82e533985e 100644
--- a/app/src/main/res/layout/game_collection_square_amway_item.xml
+++ b/app/src/main/res/layout/game_collection_square_amway_item.xml
@@ -1,58 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="70dp"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    app:cardBackgroundColor="@color/theme"
-    app:cardCornerRadius="8dp"
-    app:cardElevation="0dp">
+    android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="16dp"
-        android:paddingLeft="16dp"
-        android:paddingTop="14dp"
-        android:paddingEnd="2dp"
-        android:paddingRight="2dp"
-        android:paddingBottom="13dp">
+        android:layout_height="70dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="2dp"
+        app:cardBackgroundColor="@color/theme"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="0dp">
 
-        <TextView
-            android:id="@+id/titleTv"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:includeFontPadding="false"
-            android:singleLine="true"
-            android:text="玩家们都在安利喜欢的游戏"
-            android:textColor="@color/white"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/goIv"
-            android:layout_width="90dp"
-            android:layout_height="42dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_game_collection_square_amway_go" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_game_collection_amway"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/titleTv" />
 
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/amwayVp"
-            android:layout_width="0dp"
-            android:layout_height="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/goIv"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/titleTv" />
+            <TextView
+                android:id="@+id/titleTv"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="14dp"
+                android:layout_marginLeft="14dp"
+                android:layout_marginTop="14dp"
+                android:ellipsize="end"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:text="玩家们都在安利喜欢的游戏"
+                android:textColor="@color/white"
+                android:textSize="@dimen/primary_text_size"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
+            <ImageView
+                android:id="@+id/goIv"
+                android:layout_width="90dp"
+                android:layout_height="42dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_game_collection_square_amway_go" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/amwayVp"
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="14dp"
+                android:layout_marginLeft="14dp"
+                android:layout_marginBottom="9dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/goIv"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/titleTv" />
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/game_collection_square_item.xml b/app/src/main/res/layout/game_collection_square_item.xml
index 06783ba111..a7ed6de99e 100644
--- a/app/src/main/res/layout/game_collection_square_item.xml
+++ b/app/src/main/res/layout/game_collection_square_item.xml
@@ -53,7 +53,7 @@
 
             <TextView
                 android:id="@+id/titleTv"
-                android:layout_width="0dp"
+                android:layout_width="214dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginLeft="16dp"
@@ -64,7 +64,6 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/secondary_title_text_size"
                 android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@+id/rightContainer"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="刺激游戏大合集刺激游戏大合集刺激游戏大合集" />
@@ -83,41 +82,67 @@
 
             </LinearLayout>
 
-            <com.gh.common.view.GameIconView
-                android:id="@+id/iconIvOne"
-                game="@{entity.games[0].toGameEntity}"
-                goneIf="@{entity.games.size() == 0}"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+            <FrameLayout
+                android:id="@+id/iconOneContainer"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="13dp"
+                android:background="@drawable/bg_game_collection_game_icon"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/titleTv" />
+                app:layout_constraintTop_toBottomOf="@+id/titleTv">
 
-            <com.gh.common.view.GameIconView
-                android:id="@+id/iconIvTwo"
-                game="@{entity.games[1].toGameEntity}"
-                goneIf="@{entity.games.size() &lt; 2}"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                <com.gh.common.view.GameIconView
+                    android:id="@+id/iconIvOne"
+                    game="@{entity.games[0].toGameEntity}"
+                    goneIf="@{entity.games.size() == 0}"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/iconTwoContainer"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
-                app:layout_constraintBottom_toBottomOf="@+id/iconIvOne"
-                app:layout_constraintStart_toEndOf="@+id/iconIvOne"
-                app:layout_constraintTop_toTopOf="@+id/iconIvOne" />
+                android:background="@drawable/bg_game_collection_game_icon"
+                app:layout_constraintBottom_toBottomOf="@+id/iconOneContainer"
+                app:layout_constraintStart_toEndOf="@+id/iconOneContainer"
+                app:layout_constraintTop_toTopOf="@+id/iconOneContainer">
 
-            <com.gh.common.view.GameIconView
-                android:id="@+id/iconIvThree"
-                game="@{entity.games[2].toGameEntity}"
-                goneIf="@{entity.games.size() &lt; 3}"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                <com.gh.common.view.GameIconView
+                    android:id="@+id/iconIvTwo"
+                    game="@{entity.games[1].toGameEntity}"
+                    goneIf="@{entity.games.size() &lt; 2}"
+                    android:layout_gravity="center"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp" />
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/iconThreeContainer"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
-                app:layout_constraintBottom_toBottomOf="@+id/iconIvTwo"
-                app:layout_constraintStart_toEndOf="@+id/iconIvTwo"
-                app:layout_constraintTop_toTopOf="@+id/iconIvTwo" />
+                android:background="@drawable/bg_game_collection_game_icon"
+                app:layout_constraintBottom_toBottomOf="@+id/iconTwoContainer"
+                app:layout_constraintStart_toEndOf="@+id/iconTwoContainer"
+                app:layout_constraintTop_toTopOf="@+id/iconTwoContainer">
+
+                <com.gh.common.view.GameIconView
+                    android:id="@+id/iconIvThree"
+                    game="@{entity.games[2].toGameEntity}"
+                    goneIf="@{entity.games.size() &lt; 3}"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center" />
+
+            </FrameLayout>
 
             <TextView
                 android:id="@+id/countTv"
@@ -130,9 +155,9 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/primary_title_text_size"
                 android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@+id/iconIvThree"
-                app:layout_constraintStart_toEndOf="@+id/iconIvThree"
-                app:layout_constraintTop_toTopOf="@+id/iconIvThree"
+                app:layout_constraintBottom_toBottomOf="@+id/iconThreeContainer"
+                app:layout_constraintStart_toEndOf="@+id/iconThreeContainer"
+                app:layout_constraintTop_toTopOf="@+id/iconThreeContainer"
                 tools:text="+ 25" />
 
             <LinearLayout
@@ -191,13 +216,16 @@
             <LinearLayout
                 android:id="@+id/userContainer"
                 android:layout_width="0dp"
-                android:layout_height="18dp"
+                android:layout_height="20dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="16dp"
                 android:background="@drawable/bg_game_collection_user_container"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
+                android:paddingStart="1dp"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
                 android:paddingEnd="6dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent">
@@ -213,7 +241,7 @@
                     android:id="@+id/userTv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
+                    android:layout_marginStart="3dp"
                     android:ellipsize="end"
                     android:maxWidth="61dp"
                     android:singleLine="true"
diff --git a/app/src/main/res/layout/home_game_collection_card_item.xml b/app/src/main/res/layout/home_game_collection_card_item.xml
index 7fd1c839ac..b97a6dfbd4 100644
--- a/app/src/main/res/layout/home_game_collection_card_item.xml
+++ b/app/src/main/res/layout/home_game_collection_card_item.xml
@@ -64,7 +64,7 @@
 
             <TextView
                 android:id="@+id/titleTv"
-                android:layout_width="0dp"
+                android:layout_width="214dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginLeft="16dp"
@@ -75,7 +75,6 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/secondary_title_text_size"
                 android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@+id/rightContainer"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="刺激游戏大合集刺激游戏大合集刺激游戏大合集" />
@@ -91,44 +90,69 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/titleTv">
 
-
             </LinearLayout>
 
-            <com.gh.common.view.GameIconView
-                android:id="@+id/iconIvOne"
-                game="@{entity.games[0].toGameEntity}"
-                goneIf="@{entity.games.size() == 0}"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+            <FrameLayout
+                android:id="@+id/iconOneContainer"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="13dp"
+                android:background="@drawable/bg_game_collection_game_icon"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/titleTv" />
+                app:layout_constraintTop_toBottomOf="@+id/titleTv">
 
-            <com.gh.common.view.GameIconView
-                android:id="@+id/iconIvTwo"
-                game="@{entity.games[1].toGameEntity}"
-                goneIf="@{entity.games.size() &lt; 2}"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                <com.gh.common.view.GameIconView
+                    android:id="@+id/iconIvOne"
+                    game="@{entity.games[0].toGameEntity}"
+                    goneIf="@{entity.games.size() == 0}"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/iconTwoContainer"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
-                app:layout_constraintBottom_toBottomOf="@+id/iconIvOne"
-                app:layout_constraintStart_toEndOf="@+id/iconIvOne"
-                app:layout_constraintTop_toTopOf="@+id/iconIvOne" />
+                android:background="@drawable/bg_game_collection_game_icon"
+                app:layout_constraintBottom_toBottomOf="@+id/iconOneContainer"
+                app:layout_constraintStart_toEndOf="@+id/iconOneContainer"
+                app:layout_constraintTop_toTopOf="@+id/iconOneContainer">
 
-            <com.gh.common.view.GameIconView
-                android:id="@+id/iconIvThree"
-                game="@{entity.games[2].toGameEntity}"
-                goneIf="@{entity.games.size() &lt; 3}"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                <com.gh.common.view.GameIconView
+                    android:id="@+id/iconIvTwo"
+                    game="@{entity.games[1].toGameEntity}"
+                    goneIf="@{entity.games.size() &lt; 2}"
+                    android:layout_gravity="center"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp" />
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/iconThreeContainer"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
-                app:layout_constraintBottom_toBottomOf="@+id/iconIvTwo"
-                app:layout_constraintStart_toEndOf="@+id/iconIvTwo"
-                app:layout_constraintTop_toTopOf="@+id/iconIvTwo" />
+                android:background="@drawable/bg_game_collection_game_icon"
+                app:layout_constraintBottom_toBottomOf="@+id/iconTwoContainer"
+                app:layout_constraintStart_toEndOf="@+id/iconTwoContainer"
+                app:layout_constraintTop_toTopOf="@+id/iconTwoContainer">
+
+                <com.gh.common.view.GameIconView
+                    android:id="@+id/iconIvThree"
+                    game="@{entity.games[2].toGameEntity}"
+                    goneIf="@{entity.games.size() &lt; 3}"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center" />
+
+            </FrameLayout>
 
             <TextView
                 android:id="@+id/countTv"
@@ -141,9 +165,9 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/primary_title_text_size"
                 android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@+id/iconIvThree"
-                app:layout_constraintStart_toEndOf="@+id/iconIvThree"
-                app:layout_constraintTop_toTopOf="@+id/iconIvThree"
+                app:layout_constraintBottom_toBottomOf="@+id/iconThreeContainer"
+                app:layout_constraintStart_toEndOf="@+id/iconThreeContainer"
+                app:layout_constraintTop_toTopOf="@+id/iconThreeContainer"
                 tools:text="+ 25" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -182,13 +206,16 @@
             <LinearLayout
                 android:id="@+id/userContainer"
                 android:layout_width="0dp"
-                android:layout_height="18dp"
+                android:layout_height="20dp"
                 android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginBottom="16dp"
                 android:background="@drawable/bg_game_collection_user_container"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
+                android:paddingStart="1dp"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
                 android:paddingEnd="6dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent">
@@ -204,7 +231,7 @@
                     android:id="@+id/userTv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
+                    android:layout_marginStart="3dp"
                     android:ellipsize="end"
                     android:maxWidth="61dp"
                     android:singleLine="true"