diff --git a/Habitica/res/drawable-hdpi/sub_benefits_armoire.png b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png
new file mode 100644
index 0000000000..2b990ebc0b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_armoire.png b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png
new file mode 100644
index 0000000000..fbb5705bfd
Binary files /dev/null and b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png
new file mode 100644
index 0000000000..d54695a623
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png
new file mode 100644
index 0000000000..eeabbecfb7
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable/ad_button_background.xml b/Habitica/res/drawable/ad_button_background.xml
index 87c8b59d10..5186b00329 100644
--- a/Habitica/res/drawable/ad_button_background.xml
+++ b/Habitica/res/drawable/ad_button_background.xml
@@ -7,7 +7,7 @@
                 android:angle="0"
                 android:startColor="@color/green_100"
                 android:endColor="@color/green_500" />
-            <corners android:radius="8dp" />
+            <corners android:radius="12dp" />
         </shape>
     </item>
     <item
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <solid android:color="@color/brand_400" />
-            <corners android:radius="6dp" />
+            <corners android:radius="10dp" />
         </shape>
         <ripple android:color="@color/white" />
     </item>
diff --git a/Habitica/res/drawable/ad_button_background_content.xml b/Habitica/res/drawable/ad_button_background_content.xml
index a53d99acac..ab553aad05 100644
--- a/Habitica/res/drawable/ad_button_background_content.xml
+++ b/Habitica/res/drawable/ad_button_background_content.xml
@@ -7,7 +7,7 @@
                 android:angle="0"
                 android:startColor="@color/green_100"
                 android:endColor="@color/green_500" />
-            <corners android:radius="8dp" />
+            <corners android:radius="12dp" />
         </shape>
     </item>
     <item
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <solid android:color="?attr/colorContentBackground" />
-            <corners android:radius="6dp" />
+            <corners android:radius="10dp" />
         </shape>
         <ripple android:color="@color/white" />
     </item>
diff --git a/Habitica/res/drawable/armoire_background_full.xml b/Habitica/res/drawable/armoire_background_full.xml
new file mode 100644
index 0000000000..bb9de1b2f0
--- /dev/null
+++ b/Habitica/res/drawable/armoire_background_full.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:gravity="top">
+    <bitmap android:src="@drawable/armoire_background" />
+</item>
+    <item android:top="80dp" android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/brand_400" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/Habitica/res/drawable/sub_perk_bg.xml b/Habitica/res/drawable/sub_perk_bg.xml
new file mode 100644
index 0000000000..a62e9ef6f5
--- /dev/null
+++ b/Habitica/res/drawable/sub_perk_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<solid android:color="#005737" />
+    <corners android:radius="8dp" />
+</shape>
diff --git a/Habitica/res/drawable/subscribe_incentive_bg.xml b/Habitica/res/drawable/subscribe_incentive_bg.xml
new file mode 100644
index 0000000000..7fc46c5f00
--- /dev/null
+++ b/Habitica/res/drawable/subscribe_incentive_bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
diff --git a/Habitica/res/drawable/subscribe_incentive_bg_topround.xml b/Habitica/res/drawable/subscribe_incentive_bg_topround.xml
new file mode 100644
index 0000000000..281d577109
--- /dev/null
+++ b/Habitica/res/drawable/subscribe_incentive_bg_topround.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+ <gradient android:startColor="#72CFFF" android:endColor="#77F4C7" />
+    <corners android:topLeftRadius="24dp" android:topRightRadius="24dp" />
+</shape>
diff --git a/Habitica/res/drawable/subscriber_benefit_button_bg.xml b/Habitica/res/drawable/subscriber_benefit_button_bg.xml
new file mode 100644
index 0000000000..76e4c55b5a
--- /dev/null
+++ b/Habitica/res/drawable/subscriber_benefit_button_bg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#77F4C7" android:endColor="#72CFFF" />
+            <corners android:radius="12dp" />
+        </shape>
+    </item>
+
+    <item android:left="3dp" android:right="3dp" android:top="3dp" android:bottom="3dp">
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#72CFFF" android:endColor="#77F4C7" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml
index dc99484960..805ef4eaa4 100644
--- a/Habitica/res/layout/activity_armoire.xml
+++ b/Habitica/res/layout/activity_armoire.xml
@@ -107,10 +107,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/armoire_background"
+        android:background="@drawable/armoire_background_full"
         android:orientation="vertical"
         android:gravity="center"
-        android:paddingHorizontal="24dp"
         android:paddingTop="36dp">
         <TextView
             android:id="@+id/equipment_count_view"
@@ -130,7 +129,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="8dp"
+            android:paddingHorizontal="24dp">
             <Button
                 android:id="@+id/equip_button"
                 android:layout_width="0dp"
@@ -140,7 +140,6 @@
                 android:textStyle="bold"
                 style="@style/HabiticaButton.White"
                 android:padding="0dp"
-
                 android:layout_marginEnd="12dp"/>
             <Button
                 android:id="@+id/close_button"
@@ -158,7 +157,81 @@
             android:layout_height="60dp"
             app:text="@string/watch_ad_to_open"
             android:layout_marginTop="4dp"
+            android:layout_marginHorizontal="24dp"
             app:currency="gold" />
+
+        <FrameLayout
+            android:id="@+id/open_armoire_subscriber_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="65dp"
+            android:paddingStart="24dp"
+            android:paddingEnd="18dp"
+            android:layout_marginTop="4dp">
+            <TextView
+                android:id="@+id/open_armoire_subscriber_button"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:text="@string/subscriber_button_armoire"
+                android:textStyle="bold"
+                android:background="@drawable/subscriber_benefit_button_bg"
+                android:gravity="center"
+                android:textSize="16sp"
+                android:backgroundTint="@null"
+                android:textColor="@color/green_1"
+                android:layout_marginEnd="6dp"
+                android:layout_marginTop="5dp"
+                android:padding="0dp"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/sub_perk_bg"
+                android:textColor="@color/green_500"
+                android:paddingHorizontal="6dp"
+                android:paddingVertical="4dp"
+                style="@style/Caption2"
+                android:layout_gravity="top|end"
+                android:text="@string/sub_perk"/>
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/unsubbed_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="@dimen/spacing_large"
+            android:orientation="vertical"
+            android:paddingTop="16dp"
+            android:paddingBottom="8dp"
+            android:paddingHorizontal="24dp"
+            android:background="@drawable/subscribe_incentive_bg_topround"
+            >
+            <Button
+                android:id="@+id/subscribe_modal_button"
+                android:layout_width="match_parent"
+                android:layout_height="69dp"
+                android:text="@string/subscribe_incentive_button_armoire"
+                android:textStyle="bold"
+                style="@style/HabiticaButton.White"
+                android:textColor="@color/teal_10"
+                android:padding="0dp"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="@string/subscribe_incentive_text_armoire"
+                android:textColor="@color/teal_1"
+                android:layout_marginHorizontal="16dp"
+                style="@style/Body1"
+                android:layout_marginTop="3dp"/>
+            <TextView
+                android:id="@+id/drop_rate_button_unsubbed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/armoire_drop_rates"
+                android:textColor="@color/teal_1"
+                android:layout_marginTop="5dp"
+                style="@style/Body2"/>
+        </LinearLayout>
         <TextView
             android:id="@+id/drop_rate_button"
             android:layout_width="wrap_content"
@@ -169,4 +242,4 @@
             style="@style/Body2"/>
     </LinearLayout>
 </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/Habitica/res/layout/activity_death.xml b/Habitica/res/layout/activity_death.xml
index c7d3fcfc7d..d9b3ebb4f7 100644
--- a/Habitica/res/layout/activity_death.xml
+++ b/Habitica/res/layout/activity_death.xml
@@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <FrameLayout
         android:id="@+id/confetti_container"
@@ -18,8 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingHorizontal="23dp">
+            android:orientation="vertical">
 
             <Space
                 android:layout_width="wrap_content"
@@ -53,7 +53,8 @@
                 android:layout_marginHorizontal="@dimen/spacing_xlarge"
                 android:gravity="center"
                 android:text="@string/you_ran_out_of_health"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:paddingHorizontal="24dp" />
 
             <TextView
                 android:id="@+id/loss_description"
@@ -64,17 +65,16 @@
                 android:gravity="center"
                 android:lineSpacingExtra="4dp"
                 android:textColor="@color/text_primary"
-                android:textSize="20sp" />
+                android:textSize="20sp"
+                android:paddingHorizontal="12dp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/spacing_xlarge"
+                android:layout_margin="@dimen/spacing_large"
                 android:gravity="center"
-                android:lineSpacingExtra="4dp"
-                android:text="@string/death_description"
-                android:textColor="@color/text_secondary"
-                android:textSize="20sp" />
+                android:text="@string/faint_broken_equipment"
+                android:textColor="@color/text_quad" />
 
             <Space
                 android:layout_width="wrap_content"
@@ -88,23 +88,96 @@
                 android:layout_height="69dp"
                 android:layout_marginBottom="6dp"
                 android:text="@string/faint_button"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:layout_marginHorizontal="24dp" />
 
             <com.habitrpg.android.habitica.ui.views.ads.AdButton
                 android:id="@+id/ad_button"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 app:activeBackground="@drawable/ad_button_background_content"
-                app:text="@string/watch_ad_to_open"
-                app:textColor="@color/text_primary" />
+                app:text="@string/watch_ad_to_hang_on"
+                app:textColor="@color/text_primary"
+                android:layout_marginHorizontal="24dp"  />
+
+            <FrameLayout
+                android:id="@+id/revive_subscriber_wrapper"
+                android:layout_width="match_parent"
+                android:layout_height="65dp"
+                android:paddingStart="24dp"
+                android:paddingEnd="18dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="@dimen/spacing_large">
+                <TextView
+                    android:id="@+id/revive_subscriber_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:text="@string/subscriber_button_faint"
+                    android:textStyle="bold"
+                    android:background="@drawable/subscriber_benefit_button_bg"
+                    android:gravity="center"
+                    android:textSize="16sp"
+                    android:backgroundTint="@null"
+                    android:textColor="@color/green_1"
+                    android:layout_marginEnd="6dp"
+                    android:layout_marginTop="5dp"
+                    android:padding="0dp"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/sub_perk_bg"
+                    android:textColor="@color/green_500"
+                    android:paddingHorizontal="6dp"
+                    android:paddingVertical="4dp"
+                    style="@style/Caption2"
+                    android:layout_gravity="top|end"
+                    android:text="@string/sub_perk"/>
+            </FrameLayout>
+
 
             <TextView
-                android:layout_width="wrap_content"
+                android:id="@+id/subscriber_benefit_used_view"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/spacing_large"
-                android:gravity="center"
-                android:text="@string/faint_broken_equipment"
-                android:textColor="@color/text_quad" />
+                android:gravity="center_horizontal"
+                android:textColor="@color/text_teal"
+                android:layout_marginHorizontal="42dp"
+                tools:text="@string/subscriber_benefit_used_faint"
+                style="@style/Body1"
+                android:layout_marginBottom="@dimen/spacing_large"
+                android:layout_marginTop="8dp"/>
+
+            <LinearLayout
+                android:id="@+id/unsubbed_wrapper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginTop="@dimen/spacing_large"
+                android:orientation="vertical"
+                android:paddingTop="16dp"
+                android:paddingBottom="12dp"
+                android:paddingHorizontal="24dp"
+                android:background="@drawable/subscribe_incentive_bg_topround"
+                >
+                <Button
+                    android:id="@+id/subscribe_modal_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="69dp"
+                    android:text="@string/subscribe_incentive_button_armoire"
+                    android:textStyle="bold"
+                    style="@style/HabiticaButton.White"
+                    android:textColor="@color/teal_10"
+                    android:padding="0dp"/>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/subscribe_incentive_text_faint"
+                    android:textColor="@color/teal_1"
+                    android:layout_marginHorizontal="16dp"
+                    style="@style/Body1"
+                    android:layout_marginTop="3dp"/>
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 </FrameLayout>
diff --git a/Habitica/res/layout/fragment_items_dialog.xml b/Habitica/res/layout/fragment_items_dialog.xml
index 5a3d0c5f83..9b40f37c1c 100644
--- a/Habitica/res/layout/fragment_items_dialog.xml
+++ b/Habitica/res/layout/fragment_items_dialog.xml
@@ -24,20 +24,5 @@
             android:scrollbarThumbVertical="@color/scrollbarThumb"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:scrollbars="vertical" />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/footerTextView"
-        tools:text="Need more items. Check the Market"
-        android:gravity="center"
-        android:padding="8dp"/>
-    <Button
-        android:id="@+id/openMarketButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:text="@string/open_market"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"/>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index b908fdf46a..9a1646c504 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -90,26 +90,64 @@
                             android:layout_height="wrap_content"
                             app:srcCompat="@drawable/ic_keyboard_arrow_right_gray_24dp"/>
                     </LinearLayout>
-                    <FrameLayout
+                    <LinearLayout
                         android:visibility="gone"
+                        tools:visibility="visible"
                         android:id="@+id/quest_image_wrapper"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@drawable/layout_rounded_bg_window"
-                        android:padding="@dimen/spacing_medium"
-                        android:layout_marginBottom="@dimen/spacing_medium">
+                        android:layout_marginBottom="@dimen/spacing_medium"
+                        android:clipToPadding="true"
+                        android:clipChildren="true"
+                        android:clipToOutline="true"
+                        android:orientation="vertical">
                         <com.habitrpg.common.habitica.views.PixelArtView
                             android:id="@+id/quest_image_view"
                             android:layout_width="@dimen/quest_image_width"
                             android:layout_height="wrap_content"
                             android:scaleType="fitCenter"
+                            android:padding="@dimen/spacing_medium"
                             android:layout_gravity="center_horizontal"/>
-                    </FrameLayout>
-                    <com.habitrpg.android.habitica.ui.views.social.OldQuestProgressView
-                        android:visibility="gone"
-                        android:id="@+id/quest_progress_view"
+                        <com.habitrpg.android.habitica.ui.views.social.OldQuestProgressView
+                            android:visibility="gone"
+                            android:id="@+id/quest_progress_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                        <TextView
+                            android:id="@+id/quest_pending_items_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textSize="13sp"
+                            style="@style/Caption2"
+                            android:paddingVertical="3dp"
+                            android:gravity="center"
+                            android:textColor="@color/green_1"
+                            tools:text="Pending Items"
+                            android:background="@color/green_100"
+                            android:visibility="gone"/>
+                        <TextView
+                            android:id="@+id/quest_pending_damage_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textSize="13sp"
+                            style="@style/Caption2"
+                            android:paddingVertical="3dp"
+                            android:gravity="center"
+                            android:textColor="@color/yellow_1"
+                            tools:text="Pending Damage"
+                            android:background="@color/yellow_100"
+                            android:visibility="gone"/>
+                    </LinearLayout>
+
+                    <Button
+                        android:id="@+id/quest_mechanics_button"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        style="@style/Widget.Material3.Button.TextButton"
+                        android:text="@string/quest_mechanics"
+                        android:textColor="?colorAccent" />
+
                     <LinearLayout
                         android:id="@+id/quest_participant_response_wrapper"
                         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index e4c77324b7..ca1e5b71c5 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -1,442 +1,528 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    android:id="@+id/refresh_layout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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:id="@+id/refresh_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<androidx.core.widget.NestedScrollView
-    android:id="@+id/scroll_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbarSize="3dp"
-    android:scrollbarThumbVertical="@color/scrollbarThumb"
-    android:scrollbars="vertical">
-    <LinearLayout
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/promo_compose_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-        <RelativeLayout
-            android:id="@+id/promo_banner"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:background="@drawable/g1g1_box"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:clipChildren="true"
-            android:clipToPadding="true"
-            android:clipToOutline="true"
-            android:clickable="true"
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:layout_marginBottom="8dp">
-            <ImageView
-                android:id="@+id/promo_banner_left_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:scaleType="center"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentBottom="false"/>
-            <ImageView
-                android:id="@+id/promo_banner_right_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:scaleType="center"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"/>
-            <LinearLayout
-                android:layout_centerInParent="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical">
-                <ImageView
-                    android:id="@+id/promo_banner_title_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="6dp"/>
-                <TextView
-                    android:id="@+id/promo_banner_title_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    style="@style/SubHeader1"
-                    android:textColor="@color/white"
-                    android:layout_marginStart="84dp"
-                    android:layout_marginEnd="84dp"
-                    android:gravity="center"
-                    android:layout_marginBottom="6dp"/>
-                <TextView
-                    android:id="@+id/promo_banner_duration_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/Overline"/>
-            </LinearLayout>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="60dp"
-                android:layout_marginEnd="60dp"
-                android:gravity="center_horizontal"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:fontFamily="@string/font_family_medium"
-                android:layout_marginBottom="12dp"
-                android:layout_centerInParent="true"/>
-        </RelativeLayout>
+        android:layout_height="match_parent"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/scrollbarThumb"
+        android:scrollbars="vertical">
 
         <LinearLayout
-            android:orientation="vertical" android:layout_width="match_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="20dp">
+            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/header_image_view"
-                android:layout_width="wrap_content"
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/promo_compose_view"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:src="@drawable/subscribe_header"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="20dp"/>
+                android:visibility="gone" />
 
-            <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView
+            <RelativeLayout
+                android:id="@+id/promo_banner"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/subscriptionDetails"/>
+                android:layout_height="80dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="8dp"
+                android:background="@drawable/g1g1_box"
+                android:clickable="true"
+                android:clipChildren="true"
+                android:clipToOutline="true"
+                android:clipToPadding="true"
+                android:visibility="gone"
+                tools:visibility="visible">
 
-            <com.habitrpg.android.habitica.ui.views.DayNightTextView
-                android:id="@+id/subscribeBenefitsTitle"
-                android:layout_width="250dp"
-                android:layout_height="wrap_content"
-                android:text="@string/subscribe_prompt"
-                android:gravity="center"
-                style="@style/SubHeader1"
-                app:dayTextColor="@color/text_brand"
-                app:nightTextColor="@color/gray_400"
-                android:lineSpacingExtra="4dp"
-                android:layout_marginTop="8dp"
-                android:layout_gravity="center_horizontal"/>
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/separator_fancy"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="20dp"/>
+                <ImageView
+                    android:id="@+id/promo_banner_left_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentBottom="false"
+                    android:scaleType="center" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
                 <ImageView
-                    android:layout_width="68dp"
-                    android:layout_height="68dp"
-                    android:src="@drawable/sub_benefits_gems"
-                    android:scaleType="center"/>
+                    android:id="@+id/promo_banner_right_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:scaleType="center" />
+
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginStart="12dp"
-                    android:layout_gravity="center_vertical">
-                    <TextView
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/promo_banner_title_image"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem1"
-                        android:textColor="@color/text_primary"
-                        style="@style/Body1"/>
+                        android:layout_marginBottom="6dp" />
+
                     <TextView
+                        android:id="@+id/promo_banner_title_text"
+                        style="@style/SubHeader1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem1_description"
-                        android:textColor="@color/text_primary"
-                        style="@style/Caption2.Regular"/>
+                        android:layout_marginStart="84dp"
+                        android:layout_marginEnd="84dp"
+                        android:layout_marginBottom="6dp"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/promo_banner_duration_view"
+                        style="@style/Overline"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
-            </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:layout_marginStart="60dp"
+                    android:layout_marginEnd="60dp"
+                    android:layout_marginBottom="12dp"
+                    android:fontFamily="@string/font_family_medium"
+                    android:gravity="center_horizontal"
+                    android:textColor="@color/white"
+                    android:textSize="16sp" />
+            </RelativeLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="vertical"
+                android:padding="20dp">
+
                 <ImageView
-                    android:layout_width="68dp"
-                    android:layout_height="68dp"
-                    android:src="@drawable/sub_benefits_hourglasses"
-                    android:scaleType="center"/>
-                <LinearLayout
+                    android:id="@+id/header_image_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginStart="12dp"
-                    android:layout_gravity="center_vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem2"
-                        android:textColor="@color/text_primary"
-                        style="@style/Body1"/>
-                    <TextView
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    android:src="@drawable/subscribe_header" />
+
+                <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView
+                    android:id="@+id/subscriptionDetails"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <com.habitrpg.android.habitica.ui.views.DayNightTextView
+                    android:id="@+id/subscribeBenefitsTitle"
+                    style="@style/SubHeader1"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center"
+                    android:lineSpacingExtra="4dp"
+                    android:text="@string/subscribe_prompt"
+                    app:dayTextColor="@color/text_brand"
+                    app:nightTextColor="@color/gray_400" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginBottom="20dp"
+                    android:src="@drawable/separator_fancy" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="68dp"
+                        android:layout_height="68dp"
+                        android:scaleType="center"
+                        android:src="@drawable/sub_benefits_gems" />
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem2_description"
-                        android:textColor="@color/text_primary"
-                        style="@style/Caption2.Regular"/>
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="12dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            style="@style/Body1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem1"
+                            android:textColor="@color/text_primary" />
+
+                        <TextView
+                            style="@style/Caption2.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem1_description"
+                            android:textColor="@color/text_primary" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <com.habitrpg.common.habitica.views.PixelArtView
-                    android:id="@+id/sub_benefits_mystery_item_icon"
-                    android:layout_width="68dp"
-                    android:layout_height="68dp"
-                    android:scaleType="center"/>
+
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:id="@+id/benefit_armoire_wrapper"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginStart="12dp"
-                    android:layout_gravity="center_vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem3"
-                        android:textColor="@color/text_primary"
-                        style="@style/Body1"/>
-                    <TextView
-                        android:id="@+id/sub_benefits_mystery_item_text"
+                    android:orientation="horizontal">
+
+                    <com.habitrpg.common.habitica.views.PixelArtView
+                        android:layout_width="68dp"
+                        android:layout_height="68dp"
+                        android:scaleType="center"
+                        android:src="@drawable/sub_benefits_armoire" />
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem3_description"
-                        android:textColor="@color/text_primary"
-                        style="@style/Caption2.Regular"/>
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="12dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            style="@style/Body1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitemArmoire"
+                            android:textColor="@color/text_primary" />
+
+                        <TextView
+                            style="@style/Caption2.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitemArmoire_description"
+                            android:textColor="@color/text_primary" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="68dp"
-                    android:layout_height="68dp"
-                    android:src="@drawable/sub_benefits_pet"
-                    android:scaleType="center"/>
+
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginStart="12dp"
-                    android:layout_gravity="center_vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem4"
-                        android:textColor="@color/text_primary"
-                        style="@style/Body1"/>
-                    <TextView
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="68dp"
+                        android:layout_height="68dp"
+                        android:scaleType="center"
+                        android:src="@drawable/sub_benefits_hourglasses" />
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem4_description"
-                        android:textColor="@color/text_primary"
-                        style="@style/Caption2.Regular"/>
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="12dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            style="@style/Body1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem2"
+                            android:textColor="@color/text_primary" />
+
+                        <TextView
+                            style="@style/Caption2.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem2_description"
+                            android:textColor="@color/text_primary" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="68dp"
-                    android:layout_height="68dp"
-                    android:src="@drawable/sub_benefits_faint"
-                    android:scaleType="center"/>
+
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginStart="12dp"
-                    android:layout_gravity="center_vertical">
-                    <TextView
+                    android:orientation="horizontal">
+
+                    <com.habitrpg.common.habitica.views.PixelArtView
+                        android:id="@+id/sub_benefits_mystery_item_icon"
+                        android:layout_width="68dp"
+                        android:layout_height="68dp"
+                        android:scaleType="center" />
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitemFaint"
-                        android:textColor="@color/text_primary"
-                        style="@style/Body1"/>
-                    <TextView
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="12dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            style="@style/Body1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem3"
+                            android:textColor="@color/text_primary" />
+
+                        <TextView
+                            android:id="@+id/sub_benefits_mystery_item_text"
+                            style="@style/Caption2.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem3_description"
+                            android:textColor="@color/text_primary" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="68dp"
+                        android:layout_height="68dp"
+                        android:scaleType="center"
+                        android:src="@drawable/sub_benefits_pet" />
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitemFaint_description"
-                        android:textColor="@color/text_primary"
-                        style="@style/Caption2.Regular"/>
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="12dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            style="@style/Body1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem4"
+                            android:textColor="@color/text_primary" />
+
+                        <TextView
+                            style="@style/Caption2.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem4_description"
+                            android:textColor="@color/text_primary" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="68dp"
-                    android:layout_height="68dp"
-                    android:src="@drawable/sub_benefits_drops"
-                    android:scaleType="center"/>
+
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:id="@+id/benefit_faint_wrapper"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginStart="12dp"
-                    android:layout_gravity="center_vertical">
-                    <TextView
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="68dp"
+                        android:layout_height="68dp"
+                        android:scaleType="center"
+                        android:src="@drawable/sub_benefits_faint" />
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem5"
-                        android:textColor="@color/text_primary"
-                        style="@style/Body1"/>
-                    <TextView
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="12dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            style="@style/Body1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitemFaint"
+                            android:textColor="@color/text_primary" />
+
+                        <TextView
+                            style="@style/Caption2.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitemFaint_description"
+                            android:textColor="@color/text_primary" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="68dp"
+                        android:layout_height="68dp"
+                        android:scaleType="center"
+                        android:src="@drawable/sub_benefits_drops" />
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscribe_listitem5_description"
-                        android:textColor="@color/text_primary"
-                        style="@style/Caption2.Regular"/>
-                </LinearLayout>
-            </LinearLayout>
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="12dp"
+                        android:orientation="vertical">
 
+                        <TextView
+                            style="@style/Body1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem5"
+                            android:textColor="@color/text_primary" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/separator_fancy"
-                android:layout_gravity="center"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="12dp"/>
+                        <TextView
+                            style="@style/Caption2.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/subscribe_listitem5_description"
+                            android:textColor="@color/text_primary" />
+                    </LinearLayout>
+                </LinearLayout>
 
-            <ProgressBar
-                style="?android:attr/progressBarStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/loadingIndicator"/>
 
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginBottom="12dp"
+                    android:src="@drawable/separator_fancy" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/no_billing_subscriptions"
-                android:paddingTop="50dp"
-                android:paddingBottom="10dp"
-                android:visibility="gone" />
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/visit_habitica_website"
-                android:layout_marginBottom="50dp"
-                style="@style/HabiticaButton.Purple"
-                android:visibility="gone" />
+                <ProgressBar
+                    android:id="@+id/loadingIndicator"
+                    style="?android:attr/progressBarStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
-            <LinearLayout
-                android:id="@+id/subscriptionOptions"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
 
                 <TextView
-                    android:layout_width="250dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:gravity="center_horizontal"
-                    style="@style/SubHeader1"
-                    android:textColor="@color/text_brand"
-                    android:text="@string/subscribe_options_title"
-                    android:layout_marginBottom="20dp"/>
+                    android:paddingTop="50dp"
+                    android:paddingBottom="10dp"
+                    android:text="@string/no_billing_subscriptions"
+                    android:visibility="gone" />
 
-                <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription1month"
-                    android:layout_width="match_parent"
+                <Button
+                    style="@style/HabiticaButton.Purple"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/month"
-                    app:gemCapText="@string/subscribe1month_gemcap"/>
+                    android:layout_gravity="center"
+                    android:layout_marginBottom="50dp"
+                    android:text="@string/visit_habitica_website"
+                    android:visibility="gone" />
 
-                <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription3month"
+                <LinearLayout
+                    android:id="@+id/subscriptionOptions"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/three_months"
-                    app:gemCapText="@string/subscribe3month_gemcap"
-                    app:hourGlassCount="1" />
-                <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription6month"
-                    android:layout_width="match_parent"
+                    android:orientation="vertical">
+
+                    <TextView
+                        style="@style/SubHeader1"
+                        android:layout_width="250dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginBottom="20dp"
+                        android:gravity="center_horizontal"
+                        android:text="@string/subscribe_options_title"
+                        android:textColor="@color/text_brand" />
+
+                    <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+                        android:id="@+id/subscription1month"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:gemCapText="@string/subscribe1month_gemcap"
+                        app:recurringText="@string/month" />
+
+                    <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+                        android:id="@+id/subscription3month"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:gemCapText="@string/subscribe3month_gemcap"
+                        app:hourGlassCount="1"
+                        app:recurringText="@string/three_months" />
+
+                    <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+                        android:id="@+id/subscription6month"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:gemCapText="@string/subscribe6month_gemcap"
+                        app:hourGlassCount="2"
+                        app:recurringText="@string/six_months" />
+
+                    <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+                        android:id="@+id/subscription12month"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:flagText="@string/save_20"
+                        app:gemCapText="@string/subscribe12month_gemcap"
+                        app:hourGlassCount="4"
+                        app:recurringText="@string/twelve_months" />
+
+                    <Button
+                        android:id="@+id/subscribeButton"
+                        style="@style/HabiticaButton.Purple.Small"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:text="@string/subscribe"
+                        android:textAllCaps="false" />
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/six_months"
-                    app:gemCapText="@string/subscribe6month_gemcap"
-                    app:hourGlassCount="2" />
-                <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription12month"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginBottom="6dp"
+                    android:src="@drawable/gift_sub_gift" />
+
+                <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/twelve_months"
-                    app:gemCapText="@string/subscribe12month_gemcap"
-                    app:hourGlassCount="4"
-                    app:flagText="@string/save_20"/>
+                    android:layout_marginStart="@dimen/spacing_large"
+                    android:layout_marginEnd="@dimen/spacing_large"
+                    android:gravity="center_horizontal"
+                    android:text="@string/subscribe_gift_description"
+                    android:textColor="@color/text_quad" />
 
                 <Button
-                    android:text="@string/subscribe"
+                    android:id="@+id/gift_subscription_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/subscribeButton"
-                    style="@style/HabiticaButton.Purple.Small"
+                    android:background="@color/transparent"
+                    android:text="@string/gift_subscription"
                     android:textAllCaps="false"
-                    android:layout_marginTop="8dp"/>
+                    android:textColor="@color/text_brand_neon" />
             </LinearLayout>
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:src="@drawable/gift_sub_gift"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="6dp" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/text_quad"
-                android:text="@string/subscribe_gift_description"
-                android:gravity="center_horizontal"
-                android:layout_marginStart="@dimen/spacing_large"
-                android:layout_marginEnd="@dimen/spacing_large"/>
-            <Button
-                android:id="@+id/gift_subscription_button"
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/gift_subscription"
-                android:background="@color/transparent"
-                android:textColor="@color/text_brand_neon"
-                android:textAllCaps="false"/>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorWindowBackground">
-            <TextView android:id="@+id/supportTextView"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:text="@string/subscribe_title"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center"
-                android:textColor="@color/text_quad"
-                android:textSize="14sp"
-                android:lineSpacingExtra="4dp"
-                android:layout_marginTop="16dp"
-                android:drawablePadding="@dimen/spacing_medium"/>
+                android:background="?attr/colorWindowBackground">
+
+                <TextView
+                    android:id="@+id/supportTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="16dp"
+                    android:drawablePadding="@dimen/spacing_medium"
+                    android:gravity="center"
+                    android:lineSpacingExtra="4dp"
+                    android:paddingStart="16dp"
+                    android:paddingTop="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="16dp"
+                    android:text="@string/subscribe_title"
+                    android:textColor="@color/text_quad"
+                    android:textSize="14sp" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView></androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
+    </androidx.core.widget.NestedScrollView>
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/Habitica/res/layout/quest_mechanics_dialog.xml b/Habitica/res/layout/quest_mechanics_dialog.xml
new file mode 100644
index 0000000000..a2f272fde5
--- /dev/null
+++ b/Habitica/res/layout/quest_mechanics_dialog.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginHorizontal="@dimen/spacing_xlarge"
+    android:layout_marginVertical="@dimen/spacing_large">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quest_mechanics"
+        style="@style/ArmoireTitleTextView"
+        android:gravity="center_horizontal"
+        android:textAlignment="center"
+        android:layout_marginBottom="18dp"
+        />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_primary"
+        android:text="@string/quest_mechanics_boss_title"
+        style="@style/ArmoireSubHeader" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quest_mechanics_boss_description"
+        style="@style/ArmoireDescriptionTextView"
+        android:layout_marginBottom="12dp"
+        />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_primary"
+        android:text="@string/quest_mechanics_collecting_title"
+        style="@style/ArmoireSubHeader" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quest_mechanics_collecting_description"
+        style="@style/ArmoireDescriptionTextView"
+        android:layout_marginBottom="12dp"
+        />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_primary"
+        android:text="@string/quest_mechanics_damage_title"
+        style="@style/ArmoireSubHeader" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quest_mechanics_damage_description"
+        style="@style/ArmoireDescriptionTextView"
+        />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_primary"
+        android:text="@string/quest_mechanics_pausing_title"
+        style="@style/ArmoireSubHeader" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quest_mechanics_pausing_description"
+        style="@style/ArmoireDescriptionTextView"
+        />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_primary"
+        android:text="@string/quest_mechanics_rage_title"
+        style="@style/ArmoireSubHeader" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quest_mechanics_rage_description"
+        style="@style/ArmoireDescriptionTextView"
+        />
+</LinearLayout>
diff --git a/Habitica/res/layout/shop_ad.xml b/Habitica/res/layout/shop_ad.xml
index b7ac0cf29d..cd01641944 100644
--- a/Habitica/res/layout/shop_ad.xml
+++ b/Habitica/res/layout/shop_ad.xml
@@ -6,7 +6,8 @@
     android:orientation="vertical"
     android:gravity="center_horizontal"
     android:paddingHorizontal="50dp"
-    android:layout_marginVertical="30dp">
+    android:layout_marginTop="70dp"
+    android:layout_marginBottom="30dp">
     <ImageView
         android:id="@+id/image_view"
         android:src="@drawable/icon_shops"
diff --git a/Habitica/res/menu/menu_full_profile.xml b/Habitica/res/menu/menu_full_profile.xml
index 7ae69bcabe..56b60cda6e 100644
--- a/Habitica/res/menu/menu_full_profile.xml
+++ b/Habitica/res/menu/menu_full_profile.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/share_avatar"
+        android:title="@string/share_avatar" />
     <item android:id="@+id/copy_username"
         android:title="@string/copy_username" />
     <item android:id="@+id/copy_userid"
@@ -14,4 +16,4 @@
         <item android:id="@+id/mute_user"
             android:title="@string/mute_user" />
     </group>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/Habitica/res/menu/menu_share_avatar.xml b/Habitica/res/menu/menu_share_avatar.xml
new file mode 100644
index 0000000000..55e6e5aaf0
--- /dev/null
+++ b/Habitica/res/menu/menu_share_avatar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/share_avatar"
+        android:title="@string/share_avatar"
+        app:showAsAction="never"/>
+</menu>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 97ce0b174a..5b17f4a0ff 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1163,7 +1163,7 @@
     <string name="all_tasks_completed">You completed all your tasks. Well done!</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="terms_of_service">Terms of Service</string>
-    <string name="damage_pending">%.01f dmg pending</string>
+    <string name="damage_pending">%.01f damage pending</string>
     <string name="x_remaining">%s remaining</string>
     <string name="sale_ends_in">Sale ends in %s</string>
     <string name="my_account">My Account</string>
@@ -1236,7 +1236,7 @@
     <string name="you_ran_out_of_health">You ran out of Health!</string>
     <string name="death_description">But you can get them all back with hard work! Good luck—you’ll do great.</string>
     <string name="faint_broken_equipment">Broken equipment can be repurchased from Rewards</string>
-    <string name="faint_loss_description"><![CDATA[You’ll drop to level <b>%d</b>, lose <b>%d</b> Gold, and break <b>a piece of gear</b>…]]></string>
+    <string name="faint_loss_description"><![CDATA[You’ll drop to level <b>%d</b>, lose <b>%d</b> Gold, and break <b>a piece of gear</b>… You can earn them all back with hard work!]]></string>
     <string name="account_reset">Account Reset</string>
     <string name="avatar_skin_customization">Avatar Skin Customization</string>
     <string name="avatar_shirt_customization">Avatar Shirt Customization</string>
@@ -1398,7 +1398,8 @@
     <string name="empty_quests_description">Get Quests from leveling up, log in bonuses, or the [Quest Shop](/shops/quests)!</string>
     <string name="empty_special_description_subscribed">Get transformation items during Seasonal Galas and mystery boxes of subscriber gear are delivered at the start of each month!</string>
     <string name="empty_food_description">Complete tasks, buy an Armoire, or head over to the [Market](/shops/market) to stock up!</string>
-    <string name="empty_items_description">Complete tasks, Potion Quests, or head over to the [Market](/shops/market) to stock up!</string>
+    <string name="empty_potions_description">Complete tasks, Potion Quests, or head over to the [Market](/shops/market) to stock up!</string>
+    <string name="empty_eggs_description">Complete tasks, Egg Quests, or head over to the [Market](/shops/market) to stock up!</string>
     <string name="item_footer_title">Not getting the right %s from tasks?</string>
     <string name="item_footer_description">Check out the [Market](/shops/market) to buy just the things you need!</string>
     <string name="quests_footer_description">Check out the [Quest Shop](/shops/quests) to see what’s available!</string>
@@ -1410,6 +1411,27 @@
     <string name="open_profile">Open Profile</string>
     <string name="customize_avatar">Customize Avatar</string>
     <string name="share_avatar">Share Avatar</string>
+    <string name="subscribe_listitemArmoire">Extra Armoire chances</string>
+    <string name="subscribe_listitemArmoire_description">Get two chances at new equipment from the Armoire for the price of one</string>
+    <string name="subscribe_incentive_button_armoire">Subscribe to open again for free!</string>
+    <string name="subscribe_incentive_text_armoire">Get an extra chance at the Armoire each time you buy it with a subscription</string>
+    <string name="subscriber_button_armoire">Open again for free!</string>
+    <string name="subscriber_button_faint">Second chance: Hold on with 1HP!</string>
+    <string name="sub_perk">SUB PERK</string>
+    <string name="subscribe_incentive_text_faint">Get a second chance each day to avoid running out of HP with a subscription</string>
+    <string name="subscriber_benefit_used_faint">You already used your second chance today. It’s available again in %s</string>
+    <string name="watch_ad_to_hang_on">Watch ad to hold on with 1HP!</string>
+    <string name="quest_mechanics">Quest Mechanics</string>
+    <string name="quest_mechanics_boss_title">Damaging a Boss</string>
+    <string name="quest_mechanics_boss_description">Complete any type of task or use skills to rack up pending damage! Damage will be applied on your next day reset. Strength affects how much damage you do.</string>
+    <string name="quest_mechanics_collecting_title">Collecting Quest items</string>
+    <string name="quest_mechanics_collecting_description">When on a Collection Quest, complete your tasks for a random chance to find a Quest item. Pending items will be applied on your next day reset. Perception boosts item rates.</string>
+    <string name="quest_mechanics_damage_title">Bosses lash out for missed Dailies</string>
+    <string name="quest_mechanics_damage_description">Boss damage is calculated each time a Party member checks in throughout the day. This damage is applied the next time you perform an action that syncs with the server. Boss damage is recorded in your Party’s chat.</string>
+    <string name="quest_mechanics_pausing_title">Pausing damage</string>
+    <string name="quest_mechanics_pausing_description">"If you’re struggling to complete your Dailies, you can pause damage from Settings for a break. This will prevent the Boss from hurting you or others, but also pause your own damage. Other members missed Dailies will still cause damage, so be careful out there! "</string>
+    <string name="quest_mechanics_rage_title">Rage meters</string>
+    <string name="quest_mechanics_rage_description">Some difficult bosses have an orange Rage meter under their HP. This meter fills up when participants miss Dailies. When it fills completely, the boss will let out a fearsome attack that does extra damage!</string>
 
     <plurals name="you_x_others">
         <item quantity="zero">You</item>
@@ -1440,4 +1462,9 @@
         <item quantity="two">every other year</item>
         <item quantity="other">every %d years</item>
     </plurals>
+    <plurals name="items_pending">
+        <item quantity="zero">No items pending</item>
+        <item quantity="one">%d item pending</item>
+        <item quantity="other">%d items pending</item>
+    </plurals>
 </resources>
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index 1c2d437e7c..48c466319d 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -60,8 +60,8 @@
     <style name="Body1">
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:letterSpacing">0.035</item>
-        <item name="android:lineSpacingExtra">6sp</item>
+        <item name="android:letterSpacing">0.015</item>
+        <item name="android:lineSpacingExtra">4sp</item>
     </style>
 
     <style name="Body1_Button" parent="@style/Widget.AppCompat.Button.Borderless">
diff --git a/Habitica/res/xml/remote_config_defaults.xml b/Habitica/res/xml/remote_config_defaults.xml
index e8d6c41e19..3d52665de9 100644
--- a/Habitica/res/xml/remote_config_defaults.xml
+++ b/Habitica/res/xml/remote_config_defaults.xml
@@ -119,7 +119,7 @@
     </entry>
     <entry>
         <key>enableFaintSubs</key>
-        <value>false</value>
+        <value>true</value>
     </entry>
     <entry>
         <key>enableSpellAds</key>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
index b2640bbcf8..7632b35c7e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.interactors
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
 import android.view.View
 import android.widget.FrameLayout
 import com.habitrpg.android.habitica.R
@@ -63,7 +64,8 @@ constructor(
                     mountImageSideLength,
                     mountImageSideLength
                 )
-                mountImageView?.drawable?.draw(canvas)
+                val bitmap = (mountImageView?.drawable as? BitmapDrawable)?.bitmap ?: mountImageView?.bitmap ?: return@addButton
+                canvas.drawBitmap(bitmap, 0f, 0f, null)
                 (requestValues.context as? BaseActivity)?.shareContent(
                     "raisedPet",
                     message,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
index 67a5d4415b..f6b64bf9f1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.interactors
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
 import android.view.View
 import android.widget.FrameLayout
 import com.habitrpg.android.habitica.R
@@ -44,7 +45,8 @@ constructor(
                 val sharedImage = Bitmap.createBitmap(petImageSideLength, petImageSideLength, Bitmap.Config.ARGB_8888)
                 val canvas = Canvas(sharedImage)
                 petImageView?.drawable?.setBounds(0, 0, petImageSideLength, petImageSideLength)
-                petImageView?.drawable?.draw(canvas)
+                val bitmap = (petImageView?.drawable as? BitmapDrawable)?.bitmap ?: petImageView?.bitmap ?: return@addButton
+                canvas.drawBitmap(bitmap, 0f, 0f, null)
                 (requestValues.context as? BaseActivity)?.shareContent("hatchedPet", message, sharedImage)
                 hatchingDialog.dismiss()
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index d5a2d001b9..ca84a04c3c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -8,6 +8,7 @@ import android.view.animation.AccelerateInterpolator
 import android.widget.FrameLayout
 import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -22,6 +23,7 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.plattysoft.leonids.ParticleSystem
 import dagger.hilt.android.AndroidEntryPoint
@@ -98,6 +100,33 @@ class ArmoireActivity : BaseActivity() {
             binding.adButton.visibility = View.GONE
         }
 
+        if (appConfigManager.enableArmoireSubs()) {
+            userViewModel.user.observe(this) {
+                if (it?.isSubscribed == true && binding.openArmoireSubscriberWrapper.visibility != View.INVISIBLE) {
+                    binding.openArmoireSubscriberWrapper.visibility = View.VISIBLE
+                    binding.unsubbedWrapper.visibility = View.GONE
+                    binding.dropRateButton.visibility = View.VISIBLE
+                } else if (it?.isSubscribed == false) {
+                    binding.openArmoireSubscriberWrapper.visibility = View.GONE
+                    binding.unsubbedWrapper.visibility = View.VISIBLE
+                    binding.dropRateButton.visibility = View.GONE
+                }
+            }
+        } else {
+            binding.openArmoireSubscriberWrapper.visibility = View.GONE
+            binding.unsubbedWrapper.visibility = View.GONE
+            binding.dropRateButton.visibility = View.VISIBLE
+        }
+
+        binding.openArmoireSubscriberButton.setOnClickListener {
+            giveUserArmoire()
+            binding.openArmoireSubscriberWrapper.visibility = View.INVISIBLE
+        }
+
+        binding.subscribeModalButton.setOnClickListener {
+            MainNavigationController.navigate(R.id.subscriptionPurchaseActivity)
+        }
+
         binding.closeButton.setOnClickListener {
             finish()
         }
@@ -110,6 +139,9 @@ class ArmoireActivity : BaseActivity() {
         binding.dropRateButton.setOnClickListener {
             showDropRateDialog()
         }
+        binding.dropRateButtonUnsubbed.setOnClickListener {
+            showDropRateDialog()
+        }
         intent.extras?.let {
             val args = ArmoireActivityArgs.fromBundle(it)
             equipmentKey = args.key
@@ -130,8 +162,12 @@ class ArmoireActivity : BaseActivity() {
                 buyResponse.armoire["dropText"] ?: "",
                 buyResponse.armoire["value"] ?: ""
             )
-            binding.adButton.state = AdButton.State.UNAVAILABLE
-            binding.adButton.visibility = View.INVISIBLE
+            if (binding.adButton.visibility == View.VISIBLE) {
+                binding.adButton.state = AdButton.State.UNAVAILABLE
+                binding.adButton.visibility = View.INVISIBLE
+            } else if (binding.openArmoireSubscriberWrapper.visibility == View.VISIBLE) {
+                binding.openArmoireSubscriberWrapper.visibility = View.INVISIBLE
+            }
             hasAnimatedChanges = false
             gold = null
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
index 0a485cfac7..08815dd949 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
@@ -1,14 +1,17 @@
 package com.habitrpg.android.habitica.ui.activities
 
+import android.content.SharedPreferences
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.view.animation.AccelerateInterpolator
+import androidx.core.content.edit
 import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.ActivityDeathBinding
+import com.habitrpg.android.habitica.extensions.DateUtils
+import com.habitrpg.android.habitica.extensions.getShortRemainingString
 import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
@@ -19,9 +22,13 @@ import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.common.habitica.extensions.fromHtml
 import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
 import com.plattysoft.leonids.ParticleSystem
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import java.util.Calendar
+import java.util.Date
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -37,6 +44,9 @@ class DeathActivity : BaseActivity() {
     @Inject
     lateinit var userViewModel: MainUserViewModel
 
+    @Inject
+    lateinit var sharedPreferences: SharedPreferences
+
     override fun getLayoutResId(): Int = R.layout.activity_death
 
     override fun getContentView(layoutResId: Int?): View {
@@ -55,7 +65,6 @@ class DeathActivity : BaseActivity() {
                 if (!it) {
                     return@AdHandler
                 }
-                Log.d("AdHandler", "Reviving user")
                 lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     userRepository.updateUser("stats.hp", 1)
                     finish()
@@ -77,6 +86,52 @@ class DeathActivity : BaseActivity() {
             binding.adButton.visibility = View.GONE
         }
 
+        if (appConfigManager.enableFaintSubs()) {
+            userViewModel.user.observe(this) {
+                if (it?.isSubscribed == true && binding.reviveSubscriberWrapper.visibility != View.INVISIBLE) {
+                    val lastRevive = Date(sharedPreferences.getLong("last_sub_revive", 0L))
+                    if (DateUtils.isSameDay(Date(), lastRevive)) {
+                        binding.reviveSubscriberWrapper.visibility = View.GONE
+                        binding.subscriberBenefitUsedView.visibility = View.VISIBLE
+                        lifecycleScope.launchCatching {
+                            val date: Calendar = Calendar.getInstance()
+                            date.set(Calendar.HOUR_OF_DAY, 0)
+                            date.set(Calendar.MINUTE, 0)
+                            date.set(Calendar.SECOND, 0)
+                            date.add(Calendar.DAY_OF_MONTH, 1)
+                            val midnight = date.time
+                            while (true) {
+                                binding.subscriberBenefitUsedView.text = getString(R.string.subscriber_benefit_used_faint, midnight.getShortRemainingString())
+                                delay(1000L)
+                            }
+                        }
+                    } else {
+                        binding.reviveSubscriberWrapper.visibility = View.VISIBLE
+                        binding.subscriberBenefitUsedView.visibility = View.GONE
+                    }
+                    binding.unsubbedWrapper.visibility = View.GONE
+                } else if (it?.isSubscribed == false) {
+                    binding.reviveSubscriberWrapper.visibility = View.GONE
+                    binding.unsubbedWrapper.visibility = View.VISIBLE
+                }
+            }
+        } else {
+            binding.reviveSubscriberWrapper.visibility = View.GONE
+            binding.unsubbedWrapper.visibility = View.GONE
+            binding.subscriberBenefitUsedView.visibility = View.GONE
+        }
+
+        binding.reviveSubscriberButton.setOnClickListener {
+            sharedPreferences.edit {
+                putLong("last_sub_revive", Date().time)
+            }
+            binding.reviveSubscriberWrapper.visibility = View.INVISIBLE
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.updateUser("stats.hp", 1)
+                finish()
+            }
+        }
+
         binding.restartButton.setOnClickListener {
             binding.restartButton.isEnabled = false
             lifecycleScope.launch(ExceptionHandler.coroutine()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index 26ea188227..e95132ddec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -29,6 +29,7 @@ import com.habitrpg.android.habitica.databinding.ActivityFullProfileBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.UserStatComputer
+import com.habitrpg.android.habitica.interactors.ShareAvatarUseCase
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.models.members.Member
@@ -166,14 +167,21 @@ class FullProfileActivity : BaseActivity() {
         val inflater = menuInflater
         inflater.inflate(R.menu.menu_full_profile, menu)
         MenuCompat.setGroupDividerEnabled(menu, true)
-        val item = menu.findItem(R.id.block_user)
+        val blockItem = menu.findItem(R.id.block_user)
+        val shareItem = menu.findItem(R.id.share_avatar)
 
-        if (isMyProfile()) item.isVisible = false
+        if (isMyProfile()) {
+            blockItem.isVisible = false
+            shareItem.isVisible = true
+        } else {
+            blockItem.isVisible = true
+            shareItem.isVisible = false
+        }
 
         if (isUserBlocked()) {
-            item?.title = getString(R.string.unblock_user)
+            blockItem?.title = getString(R.string.unblock_user)
         } else {
-            item?.title = getString(R.string.block)
+            blockItem?.title = getString(R.string.block)
         }
         menu.setGroupVisible(R.id.admin_items, isModerator)
         if (isModerator || isUserSupport) {
@@ -264,6 +272,22 @@ class FullProfileActivity : BaseActivity() {
                 muteUser()
                 true
             }
+            R.id.share_avatar -> {
+                member.value?.let {
+                    val usecase = ShareAvatarUseCase()
+                    lifecycleScope.launchCatching {
+                        usecase.callInteractor(
+                                ShareAvatarUseCase.RequestValues(
+                                    this@FullProfileActivity,
+                                    it,
+                                    "Check out my avatar on Habitica!",
+                                    "avatar_bottomsheet"
+                                )
+                        )
+                    }
+                }
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index c058d41ac9..876b1e18e8 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -19,6 +19,7 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.collectAsState
@@ -312,9 +313,10 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                     HabiticaButton(
                                         background = HabiticaTheme.colors.tintedUiSub,
                                         color = Color.White,
+                                        modifier = Modifier.height(48.dp),
                                         onClick = {
                                             dismiss()
-                                            MainNavDirections.openProfileActivity(user?.id ?: "")
+                                            MainNavigationController.navigate(MainNavDirections.openProfileActivity(user?.id ?: ""))
                                         }) {
                                         Text(stringResource(id = R.string.open_profile))
                                     }
@@ -322,6 +324,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                     HabiticaButton(
                                         background = HabiticaTheme.colors.tintedUiSub,
                                         color = Color.White,
+                                        modifier = Modifier.height(48.dp),
                                         onClick = {
                                             dismiss()
                                             MainNavigationController.navigate(R.id.avatarOverviewFragment)
@@ -332,6 +335,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                     HabiticaButton(
                                         background = HabiticaTheme.colors.tintedUiSub,
                                         color = Color.White,
+                                        modifier = Modifier.height(48.dp),
                                         onClick = {
                                             dismiss()
                                             user?.let {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
index cb7b715507..315b6ae432 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
@@ -231,10 +231,6 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<BaseMa
                     if ((ownedItem?.numberOwned ?: 0) > 0) {
                         menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.use_item)))
                     }
-                } else if (ownedItem?.itemType == "special") {
-                    if ((ownedItem?.numberOwned ?: 0) > 0) {
-                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.use_item)))
-                    }
                 }
                 menu.setSelectionRunnable { index ->
                     if (item == null && ownedItem != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index 5a49709873..085b9f76b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -260,7 +260,7 @@ class NavigationDrawerFragment : DialogFragment() {
 
     private fun updateUser(user: User) {
         binding?.avatarView?.setOnClickListener {
-            MainNavDirections.openProfileActivity(user.id ?: "")
+            MainNavigationController.navigate(MainNavDirections.openProfileActivity(user.id ?: ""))
         }
 
         setMessagesCount(user.inbox)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index 3c31640f3e..019850733f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -2,6 +2,9 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.customization
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
@@ -27,6 +30,7 @@ import androidx.lifecycle.map
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentComposeScrollingBinding
+import com.habitrpg.android.habitica.interactors.ShareAvatarUseCase
 import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
@@ -91,14 +95,6 @@ open class AvatarOverviewFragment :
                         },
                         { type, equipped, isCostume ->
                             displayEquipmentFragment(type, equipped, isCostume)
-                        }, {
-                            val avatarView = AvatarView(requireActivity(), showBackground = true, showMount = true, showPet = true)
-                            avatarView.layoutParams = ViewGroup.LayoutParams(140, 147)
-                            userViewModel.user.value?.let { avatarView.setAvatar(it) }
-                            avatarView.onAvatarImageReady { image ->
-                                if (image == null) return@onAvatarImageReady
-                                (requireActivity() as BaseActivity).shareContent("customization", "Look at my Avatar!", image.scale(image.width * 3, image.height * 3, false))
-                            }
                         }
                     )
                 }
@@ -140,6 +136,30 @@ open class AvatarOverviewFragment :
         MainNavigationController.navigate(AvatarOverviewFragmentDirections.openEquipmentDetail(type, isCostume, equipped ?: ""))
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.menu_share_avatar, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.share_avatar) {
+            userViewModel.user.value?.let {
+                val usecase = ShareAvatarUseCase()
+                lifecycleScope.launchCatching {
+                    usecase.callInteractor(
+                        ShareAvatarUseCase.RequestValues(
+                            requireActivity() as BaseActivity,
+                            it,
+                            "Check out my avatar on Habitica!",
+                            "avatar_bottomsheet"
+                        )
+                    )
+                }
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
     override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
         val newSize: String = if (position == 0) "slim" else "broad"
 
@@ -162,7 +182,6 @@ fun AvatarOverviewView(
     onCustomizationTap: (String, String?) -> Unit,
     onAvatarEquipmentTap: (String, String?) -> Unit,
     onEquipmentTap: (String, String?, Boolean) -> Unit,
-    onShareTap: () -> Unit
 ) {
     val user by userViewModel.user.observeAsState()
     Column(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
index 0a22b7112c..e46f82d895 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
@@ -128,7 +128,9 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                 "food" -> getString(R.string.empty_food_description)
                 "quests" -> getString(R.string.empty_quests_description)
                 "special" -> getString(R.string.empty_special_description_subscribed)
-                else -> getString(R.string.empty_items_description)
+                "eggs" -> getString(R.string.empty_eggs_description)
+                "hatchingPotions" -> getString(R.string.empty_potions_description)
+                else -> ""
             },
             when (itemType) {
                 "eggs" -> R.drawable.icon_eggs
@@ -143,9 +145,6 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
 
         layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
         binding?.recyclerView?.layoutManager = layoutManager
-        activity?.let {
-            binding?.recyclerView?.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(it, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
-        }
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
         setAdapter()
@@ -164,29 +163,16 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
             this.isHatching -> {
                 binding?.titleTextView?.text = getString(R.string.hatch_with, this.hatchingItem?.text)
                 binding?.titleTextView?.visibility = View.VISIBLE
-                binding?.footerTextView?.text = getString(R.string.hatching_market_info)
-                binding?.footerTextView?.visibility = View.VISIBLE
-                binding?.openMarketButton?.visibility = View.VISIBLE
             }
             this.isFeeding -> {
                 binding?.titleTextView?.text = getString(R.string.dialog_feeding, this.feedingPet?.text)
                 binding?.titleTextView?.visibility = View.VISIBLE
-                binding?.footerTextView?.text = getString(R.string.feeding_market_info)
-                binding?.footerTextView?.visibility = View.VISIBLE
-                binding?.openMarketButton?.visibility = View.VISIBLE
             }
             else -> {
                 binding?.titleTextView?.visibility = View.GONE
-                binding?.footerTextView?.visibility = View.GONE
-                binding?.openMarketButton?.visibility = View.GONE
             }
         }
 
-        binding?.openMarketButton?.setOnClickListener {
-            dismiss()
-            openMarket()
-        }
-
         this.loadItems()
     }
 
@@ -242,6 +228,20 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
             }
             adapter?.onHatchPet = { pet, egg -> hatchPet(pet, egg) }
             adapter?.onFeedPet = { food -> feedPet(food) }
+
+            adapter?.itemType = itemType ?: ""
+            adapter?.itemText = (if (itemType == "hatchingPotions") context?.getString(R.string.potions) else itemTypeText) ?: ""
+            adapter?.onOpenShop = {
+                Analytics.sendEvent("Items CTA tap", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf(
+                    "area" to "bottom",
+                    "type" to (itemType ?: "")
+                ))
+                if (itemType == "quests") {
+                    MainNavigationController.navigate(R.id.questShopFragment)
+                } else {
+                    openMarket()
+                }
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index 171a77016c..31375f48dd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -92,6 +92,11 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        if (savedInstanceState != null) {
+            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "")
+            this.itemTypeText = savedInstanceState.getString(ITEM_TYPE_TEXT_KEY, "")
+        }
+
         binding?.refreshLayout?.setOnRefreshListener(this)
         val buttonMethod = {
             Analytics.sendEvent("Items CTA tap", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf(
@@ -110,7 +115,9 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
                 "food" -> getString(R.string.empty_food_description)
                             "quests" -> getString(R.string.empty_quests_description)
                 "special" -> getString(R.string.empty_special_description_subscribed)
-                else -> getString(R.string.empty_items_description)
+                "eggs" -> getString(R.string.empty_eggs_description)
+                "hatchingPotions" -> getString(R.string.empty_potions_description)
+                else -> ""
                             },
             when (itemType) {
                             "eggs" -> R.drawable.icon_eggs
@@ -134,9 +141,6 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
             }
         }
 
-        if (savedInstanceState != null) {
-            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "")
-        }
 
         binding?.titleTextView?.visibility = View.GONE
         setAdapter()
@@ -221,6 +225,7 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putString(ITEM_TYPE_KEY, this.itemType)
+        outState.putString(ITEM_TYPE_TEXT_KEY, this.itemTypeText)
     }
 
     override fun onRefresh() {
@@ -361,5 +366,6 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
     companion object {
 
         private const val ITEM_TYPE_KEY = "CLASS_TYPE_KEY"
+        private const val ITEM_TYPE_TEXT_KEY = "CLASS_TYPE_TEXT_KEY"
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index 72977ead81..e1426e848e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -134,6 +134,9 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
             }
         }
 
+        binding?.benefitArmoireWrapper?.isVisible = appConfigManager.enableArmoireSubs()
+        binding?.benefitFaintWrapper?.isVisible = appConfigManager.enableFaintSubs()
+
         Analytics.sendNavigationEvent("subscription screen")
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index ce60a00cde..4c6ec0dea5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -39,6 +39,7 @@ import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.LoadingButtonState
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
 import com.habitrpg.android.habitica.ui.views.social.PartySeekingListItem
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
@@ -146,6 +147,10 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
         viewModel.getGroupData().observe(viewLifecycleOwner) { updateParty(it) }
         viewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
         viewModel.getMembersData().observe(viewLifecycleOwner) { updateMembersList(it) }
+
+        binding?.questMechanicsButton?.setOnClickListener {
+            showQuestMechanicsDialog()
+        }
     }
 
     private fun refreshParty() {
@@ -168,6 +173,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             binding?.newQuestButton?.visibility = View.GONE
             binding?.questDetailButton?.visibility = View.VISIBLE
             binding?.questImageWrapper?.visibility = View.VISIBLE
+            binding?.questMechanicsButton?.visibility = View.VISIBLE
             lifecycleScope.launch(Dispatchers.Main) {
                 delay(500)
                 val content =
@@ -181,6 +187,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             binding?.questDetailButton?.visibility = View.GONE
             binding?.questImageWrapper?.visibility = View.GONE
             binding?.questProgressView?.visibility = View.GONE
+            binding?.questMechanicsButton?.visibility = View.GONE
         }
 
         binding?.findNewMember?.isVisible = viewModel.isLeader == true
@@ -208,7 +215,13 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             }
         }
 
-        binding?.questProgressView?.configure(user, viewModel.isUserOnQuest)
+
+        if (viewModel.isQuestActive && viewModel.isUserOnQuest) {
+            val value = (user.party?.quest?.progress?.up ?: 0F).toDouble()
+            binding?.questPendingDamageView?.text = getString(R.string.damage_pending, value)
+            val collectedItems = user.party?.quest?.progress?.collectedItems
+            binding?.questPendingDamageView?.text = requireContext().resources.getQuantityString(R.plurals.items_pending, collectedItems ?: 0, collectedItems ?: 0)
+        }
 
         if ((user.invitations?.parties?.count() ?: 0) > 0) {
             binding?.partyInvitationWrapper?.visibility = View.VISIBLE
@@ -291,6 +304,8 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             if (questParticipants?.find { it.key == viewModel.userViewModel.userID } != null) {
                 binding?.questParticipationView?.text =
                     context?.getString(R.string.number_participants, questParticipants.size)
+                binding?.questPendingDamageView?.isVisible = questContent.isBossQuest
+                binding?.questPendingItemsView?.isVisible = !questContent.isBossQuest
             } else {
                 binding?.questParticipationView?.text =
                     context?.getString(R.string.not_participating)
@@ -304,13 +319,18 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                 }
                 binding?.questImageWrapper?.alpha = 0.5f
                 binding?.questProgressView?.alpha = 0.5f
+                binding?.questPendingDamageView?.isVisible = false
+                binding?.questPendingItemsView?.isVisible = false
             }
+
         } else {
             binding?.questProgressView?.visibility = View.GONE
             val members = viewModel.getGroupData().value?.quest?.members
             val responded = members?.filter { it.isParticipating != null }
             binding?.questParticipationView?.text =
                 context?.getString(R.string.number_responded, responded?.size, members?.size)
+            binding?.questPendingDamageView?.isVisible = false
+            binding?.questPendingItemsView?.isVisible = false
         }
     }
 
@@ -513,4 +533,10 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     private fun questDetailButtonClicked() {
         MainNavigationController.navigate(PartyFragmentDirections.openQuestDetail())
     }
+
+    private fun showQuestMechanicsDialog() {
+        val dialog = HabiticaBottomSheetDialog(requireContext())
+        dialog.setContentView(R.layout.quest_mechanics_dialog)
+        dialog.show()
+    }
 }
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 be791b6f7a..347683ae65 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
@@ -97,7 +97,7 @@ class PetViewHolder(
         DataBindingUtils.loadImage(itemView.context, imageName) {
             val resources = itemView.context.resources ?: return@loadImage
             val drawable =
-                if (trained == 0) BitmapDrawable(resources, it.toBitmap().extractAlpha()) else it
+                if (trained == 0 && canRaiseToMount) BitmapDrawable(resources, it.toBitmap().extractAlpha()) else it
             if (binding.imageView.tag == imageName) {
                 binding.imageView.bitmap = drawable.toBitmap()
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
index cfa10bd73a..f82daefd41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
@@ -25,12 +25,6 @@ import com.habitrpg.common.habitica.extensions.loadImage
 class OldQuestProgressView : LinearLayout {
     private val binding = QuestProgressOldBinding.inflate(context.layoutInflater, this)
 
-    private val rect = RectF()
-    private val displayDensity = context.resources.displayMetrics.density
-    private val lightGray = context.getThemeColor(R.attr.colorWindowBackground)
-    private val mediumGray = ContextCompat.getColor(context, R.color.offset_background)
-    private val darkGray = ContextCompat.getColor(context, R.color.separator)
-
     constructor(context: Context) : super(context) {
         setupView(context)
     }
@@ -40,7 +34,6 @@ class OldQuestProgressView : LinearLayout {
     }
 
     private fun setupView(context: Context) {
-        setWillNotDraw(false)
         orientation = VERTICAL
 
         setScaledPadding(context, 16, 16, 16, 16)
@@ -50,19 +43,6 @@ class OldQuestProgressView : LinearLayout {
         binding.bossRageView.setSecondaryIcon(HabiticaIconsHelper.imageOfRage())
     }
 
-    override fun onDraw(canvas: Canvas) {
-        rect.set(
-            0.0f,
-            0.0f,
-            canvas.width.toFloat() / displayDensity,
-            canvas.height.toFloat() / displayDensity
-        )
-        canvas.scale(displayDensity, displayDensity)
-        HabiticaIcons.drawQuestBackground(canvas, rect, lightGray, darkGray, mediumGray)
-        canvas.scale(1.0f / displayDensity, 1.0f / displayDensity)
-        super.onDraw(canvas)
-    }
-
     fun setData(quest: QuestContent, progress: QuestProgress?) {
         binding.collectionContainer.removeAllViews()
         if (quest.isBossQuest) {
@@ -97,20 +77,4 @@ class OldQuestProgressView : LinearLayout {
             }
         }
     }
-
-    fun configure(user: User, userOnQuest: Boolean?) {
-        val value = (user.party?.quest?.progress?.up ?: 0F).toDouble()
-        val collectedItems = user.party?.quest?.progress?.collectedItems
-        if (userOnQuest == true) {
-            binding.bossHealthView.pendingValue = value
-            binding.bossHealthView.description = context.getString(R.string.damage_pending, value)
-            binding.bossHealthView.descriptionIconVisibility = View.VISIBLE
-            binding.collectedItemsNumberView.text = context.getString(R.string.quest_items_found, collectedItems)
-        } else {
-            binding.bossHealthView.pendingValue = 0.0
-            binding.bossHealthView.description = ""
-            binding.bossHealthView.descriptionIconVisibility = View.GONE
-            binding.collectedItemsNumberView.text = ""
-        }
-    }
 }
diff --git a/Screenshot_20230824_132939.png b/Screenshot_20230824_132939.png
new file mode 100644
index 0000000000..810367be90
Binary files /dev/null and b/Screenshot_20230824_132939.png differ
diff --git a/Screenshot_20230824_133756.png b/Screenshot_20230824_133756.png
new file mode 100644
index 0000000000..2b87f9d986
Binary files /dev/null and b/Screenshot_20230824_133756.png differ
diff --git a/Screenshot_20230825_151442.png b/Screenshot_20230825_151442.png
new file mode 100644
index 0000000000..99cd16807f
Binary files /dev/null and b/Screenshot_20230825_151442.png differ
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt b/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
index 7c77dcc1e6..5e23a70ca9 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
@@ -148,12 +148,10 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
 
     fun setDescriptionIcon(iconRes: Drawable) {
         binding.descriptionIconView.setImageDrawable(iconRes)
-        binding.descriptionIconView.visibility = View.VISIBLE
     }
 
     fun setDescriptionIcon(bitmap: Bitmap) {
         binding.descriptionIconView.setImageBitmap(bitmap)
-        binding.descriptionIconView.visibility = View.VISIBLE
     }
 
     fun setValueText(valueText: String) {
diff --git a/version.properties b/version.properties
index da3161dc07..071d764ba7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.3
-CODE=6371
+CODE=6381
\ No newline at end of file