diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 6eb516b42..b7e45058b 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -443,24 +443,28 @@
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.MarketFragment"
         android:label="@string/market">
         <deepLink app:uri="habitica.com/inventory/market" />
+        <deepLink app:uri="habitica.com/shops/market" />
     </fragment>
     <fragment
         android:id="@+id/questShopFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.QuestShopFragment"
         android:label="@string/questShop">
         <deepLink app:uri="habitica.com/inventory/quests" />
+        <deepLink app:uri="habitica.com/shops/quests" />
     </fragment>
     <fragment
         android:id="@+id/seasonalShopFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.SeasonalShopFragment"
         android:label="@string/seasonalShop">
         <deepLink app:uri="habitica.com/inventory/seasonal" />
+        <deepLink app:uri="habitica.com/shops/seasonal" />
     </fragment>
     <fragment
         android:id="@+id/timeTravelersShopFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.TimeTravelersShopFragment"
         android:label="@string/timeTravelers">
         <deepLink app:uri="habitica.com/inventory/time" />
+        <deepLink app:uri="habitica.com/shops/time" />
     </fragment>
     <fragment
         android:id="@+id/supportMainFragment"
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
index 8c2da7ace..d92f56aef 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
@@ -473,8 +473,8 @@ class AvatarView : FrameLayout {
             // full hero box when showMount and showPet is enabled (140w * 147h)
             // compact hero box when only showBackground is enabled (114w * 114h)
             // hero only box when all show settings disabled (90w * 90h)
-            val viewWidth = if (width > 0) width else layoutParams.width
-            val viewHeight = if (height > 0) height else layoutParams.height
+            val viewWidth = if (width > 0) width else (layoutParams?.width ?: 140)
+            val viewHeight = if (height > 0) height else (layoutParams?.height ?: 147)
             val width = if (viewWidth > 0) viewWidth.toFloat() else 140.dpToPx(context).toFloat()
             val height = if (viewHeight > 0) viewHeight.toFloat() else 147.dpToPx(context).toFloat()
             avatarRectF = RectF(0f, 0f, width, height)
diff --git a/version.properties b/version.properties
index 3d69a2f4e..64b8078eb 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.2.5
-CODE=6331
\ No newline at end of file
+CODE=6341
\ No newline at end of file