diff --git a/Habitica/res/drawable-hdpi/stable_equipped_star.png b/Habitica/res/drawable-hdpi/stable_equipped_star.png
new file mode 100644
index 000000000..6783beb13
Binary files /dev/null and b/Habitica/res/drawable-hdpi/stable_equipped_star.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_equipped_star.png b/Habitica/res/drawable-mdpi/stable_equipped_star.png
new file mode 100644
index 000000000..e40c0d1de
Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_equipped_star.png differ
diff --git a/Habitica/res/drawable-xhdpi/stable_equipped_star.png b/Habitica/res/drawable-xhdpi/stable_equipped_star.png
new file mode 100644
index 000000000..bb61849d3
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/stable_equipped_star.png differ
diff --git a/Habitica/res/drawable-xxhdpi/stable_equipped_star.png b/Habitica/res/drawable-xxhdpi/stable_equipped_star.png
new file mode 100644
index 000000000..c7b86a466
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/stable_equipped_star.png differ
diff --git a/Habitica/res/drawable/pill_bg_teal_100.xml b/Habitica/res/drawable/pill_bg_teal_100.xml
new file mode 100644
index 000000000..766abdf5d
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_teal_100.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/teal_100"/>
+    <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/mount_overview_item.xml b/Habitica/res/layout/mount_overview_item.xml
index 76293add4..36d2e5d7d 100644
--- a/Habitica/res/layout/mount_overview_item.xml
+++ b/Habitica/res/layout/mount_overview_item.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:clickable="true"
     android:focusable="true">
 
@@ -46,4 +47,16 @@
             android:gravity="center"
             android:textSize="12sp" />
     </LinearLayout>
+    <ImageView
+        android:id="@+id/active_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/shopitem_status_size"
+        android:layout_gravity="end"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_alignParentTop="true"
+        android:layout_alignStart="@id/card_view"
+        android:layout_marginStart="-4dp"
+        android:src="@drawable/star"
+        style="@style/ActiveLabel"/>
 </RelativeLayout>
diff --git a/Habitica/res/layout/pet_detail_item.xml b/Habitica/res/layout/pet_detail_item.xml
index 7fbe91ad3..a88125f5b 100644
--- a/Habitica/res/layout/pet_detail_item.xml
+++ b/Habitica/res/layout/pet_detail_item.xml
@@ -1,57 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/card_view"
-    android:layout_height="88dp"
-    android:layout_width="76dp"
-    android:background="@drawable/layout_rounded_bg_window"
-    android:orientation="vertical"
-    android:padding="8dp">
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="68dp"
-        android:layout_height="68dp"
-        android:layout_gravity="center"/>
-    <ProgressBar
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/trainedProgressBar"
-        android:progressTint="@color/green_100"
-        android:progressBackgroundTint="@color/offset_background"
-        android:layout_marginStart="7dp"
-        android:layout_marginEnd="7dp"
-        android:max="50" />
-    <RelativeLayout
-        android:id="@+id/item_wrapper"
-        android:layout_width="86dp"
-        android:layout_height="68dp"
-        android:layout_gravity="center">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:focusable="true">
+    <LinearLayout
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="6dp"
+        android:id="@+id/card_view"
+        android:layout_height="88dp"
+        android:layout_width="76dp"
+        android:background="@drawable/layout_rounded_bg_window"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:padding="8dp">
         <ImageView
-            android:id="@+id/hatchingPotion_view"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true" />
+            android:id="@+id/imageView"
+            android:layout_width="68dp"
+            android:layout_height="68dp"
+            android:layout_gravity="center"/>
+        <ProgressBar
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/trainedProgressBar"
+            android:progressTint="@color/green_100"
+            android:progressBackgroundTint="@color/offset_background"
+            android:layout_marginStart="7dp"
+            android:layout_marginEnd="7dp"
+            android:max="50" />
+        <RelativeLayout
+            android:id="@+id/item_wrapper"
+            android:layout_width="86dp"
+            android:layout_height="68dp"
+            android:layout_gravity="center">
+            <ImageView
+                android:id="@+id/hatchingPotion_view"
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true" />
+            <ImageView
+                android:id="@+id/egg_view"
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentStart="true" />
+        </RelativeLayout>
         <ImageView
-            android:id="@+id/egg_view"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentStart="true" />
-    </RelativeLayout>
+            android:id="@+id/checkmark_view"
+            android:layout_width="12dp"
+            android:layout_height="10dp"
+            android:src="@drawable/pet_checkmark"
+            android:layout_gravity="center" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:id="@+id/titleTextView"
+            android:textSize="12sp"
+            android:gravity="center"
+            style="@style/RowTitle" />
+    </LinearLayout>
     <ImageView
-        android:id="@+id/checkmark_view"
-        android:layout_width="12dp"
-        android:layout_height="10dp"
-        android:src="@drawable/pet_checkmark"
-        android:layout_gravity="center" />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:id="@+id/titleTextView"
-        android:textSize="12sp"
-        android:gravity="center"
-        style="@style/RowTitle" />
-</LinearLayout>
\ No newline at end of file
+        android:id="@+id/active_indicator"
+        android:layout_width="@dimen/shopitem_status_size"
+        android:layout_height="@dimen/shopitem_status_size"
+        android:layout_gravity="end"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_alignStart="@id/card_view"
+        android:layout_marginStart="-4dp"
+        android:layout_alignParentTop="true"
+        android:src="@drawable/star"
+        style="@style/ActiveLabel"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 161ec304b..e0c3b08a0 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -822,4 +822,14 @@
         <item name="android:textSize">12sp</item>
         <item name="android:textStyle">bold</item>
     </style>
+    <style name="ActiveLabel">
+        <item name="android:background">@drawable/pill_bg_teal_100</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/MountViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
index 874a4da38..27aab30e1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
@@ -39,6 +39,7 @@ class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject
             binding.imageView.alpha = 0.2f
         }
         binding.imageView.background = null
+        binding.activeIndicator.visibility = if (user?.currentMount.equals(animal?.key)) View.VISIBLE else View.GONE
         DataBindingUtils.loadImage(itemView.context, imageName) {
             val drawable = if (owned) it else BitmapDrawable(itemView.context.resources, it.toBitmap().extractAlpha())
             binding.imageView.background = drawable
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
index 2c176b612..a4ac2ffc6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
@@ -96,6 +96,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
             binding.trainedProgressBar.progressBackgroundTintMode = PorterDuff.Mode.SRC_OVER
         }
         binding.imageView.background = null
+        binding.activeIndicator.visibility = if (user?.currentPet.equals(animal?.key)) View.VISIBLE else View.GONE
         DataBindingUtils.loadImage(itemView.context, imageName) {
             val resources = itemView.context.resources ?: return@loadImage
             val drawable = if (trained == 0) BitmapDrawable(resources, it.toBitmap().extractAlpha()) else it