diff --git a/Habitica/res/drawable/pill_bg_gray_300.xml b/Habitica/res/drawable/pill_bg_gray_300.xml
new file mode 100644
index 000000000..35781fab0
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_gray_300.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/dimmed_background"/>
+    <corners android:radius="12dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/achievement_grid_item.xml b/Habitica/res/layout/achievement_grid_item.xml
index 7dcb8d59b..ca8f8b076 100644
--- a/Habitica/res/layout/achievement_grid_item.xml
+++ b/Habitica/res/layout/achievement_grid_item.xml
@@ -47,15 +47,8 @@
         android:id="@+id/achievement_count_label"
         android:layout_width="wrap_content"
         android:layout_height="24dp"
-        android:minWidth="24dp"
-        android:background="@drawable/achievement_badge_bg"
-        android:gravity="center"
         tools:text="1"
-        android:paddingStart="2dp"
-        android:paddingEnd="2dp"
-        android:textColor="@color/white"
-        android:textSize="12sp"
-        android:textStyle="bold"
+        style="@style/CountLabel"
         android:layout_alignParentTop="true"
         android:layout_alignStart="@id/achievement_container"
         android:layout_marginStart="-4dp"/>
diff --git a/Habitica/res/layout/achievement_list_item.xml b/Habitica/res/layout/achievement_list_item.xml
index 83857ccf6..47cfd747f 100644
--- a/Habitica/res/layout/achievement_list_item.xml
+++ b/Habitica/res/layout/achievement_list_item.xml
@@ -18,15 +18,9 @@
         android:id="@+id/achievement_count_label"
         android:layout_width="wrap_content"
         android:layout_height="24dp"
-        android:minWidth="24dp"
-        android:background="@drawable/achievement_badge_bg"
         android:gravity="center"
         tools:text="1"
-        android:paddingStart="2dp"
-        android:paddingEnd="2dp"
-        android:textColor="@color/white"
-        android:textSize="12sp"
-        android:textStyle="bold"
+        style="@style/CountLabel"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
         android:layout_marginStart="13dp"
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index 0913b524b..0bf9f26aa 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -21,11 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             tools:text="2"
-            android:background="@drawable/achievement_badge_bg"
-            android:paddingStart="2dp"
-            android:paddingEnd="2dp"
-            android:textSize="12sp"
-            android:textColor="@color/white" />
+            style="@style/CountLabel"/>
     </FrameLayout>
 
     <TextView
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index bcfd607c7..a80e55ce4 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -62,13 +62,11 @@
         android:textColor="@color/white" />
     <TextView
         android:id="@+id/item_detail_indicator"
-        android:layout_width="@dimen/shopitem_status_size"
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/shopitem_status_size"
         android:layout_gravity="end"
         android:visibility="gone"
         android:layout_alignEnd="@id/container"
-        android:gravity="center"
-        android:textColor="@color/white"
         android:layout_marginEnd="-4dp"
-        android:textSize="12sp" />
+        style="@style/CountLabel"/>
 </RelativeLayout>
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index f3ab3210c..90804c6c8 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -69,14 +69,12 @@
     </LinearLayout>
     <TextView
         android:id="@+id/count_label"
-        android:layout_width="24dp"
+        android:layout_width="wrap_content"
         android:layout_height="24dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
         android:layout_marginStart="13dp"
-        android:background="@drawable/circle_gray300"
-        tools:text="1"
-        android:textColor="@color/white"
-        android:gravity="center"
+        tools:text="10000"
+        style="@style/CountLabel"
         />
 </RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index d9b13fcd0..9f805b86b 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -811,4 +811,15 @@
         <item name="android:background">@drawable/layout_rounded_bg_window</item>
         <item name="android:layout_margin">@dimen/spacing_medium</item>
     </style>
+
+    <style name="CountLabel">
+        <item name="android:background">@drawable/pill_bg_gray_300</item>
+        <item name="android:paddingStart">4dp</item>
+        <item name="android:paddingEnd">4dp</item>
+        <item name="android:minWidth">24dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index 6983f2468..f8a71269a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -3,9 +3,11 @@ package com.habitrpg.android.habitica.ui.viewHolders
 import android.content.Context
 import android.graphics.drawable.BitmapDrawable
 import android.view.View
+import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.databinding.RowShopitemBinding
+import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
@@ -76,6 +78,16 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
             binding.itemDetailIndicator.visibility = View.VISIBLE
         }
 
+        if (binding.itemDetailIndicator.visibility == View.VISIBLE) {
+            val layoutParams = binding.itemDetailIndicator.layoutParams
+            layoutParams.width = if (binding.itemDetailIndicator.text.isBlank()) {
+                24.dpToPx(context)
+            } else {
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            }
+            binding.itemDetailIndicator.layoutParams = layoutParams
+        }
+
         binding.priceLabel.isLocked = item.locked || !canBuy
     }