diff --git a/Habitica/build.gradle.kts b/Habitica/build.gradle.kts
index b26935299..bec177368 100644
--- a/Habitica/build.gradle.kts
+++ b/Habitica/build.gradle.kts
@@ -106,6 +106,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
+    hilt {
+        enableAggregatingTask = true
+    }
+
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
@@ -116,8 +120,9 @@ android {
     }
 
     lint {
-        abortOnError = false
-        disable.addAll(listOf("MissingTranslation", "InvalidPackage"))
+        checkReleaseBuilds = false
+        abortOnError = true
+        disable.addAll(listOf("MissingTranslation"))
         enable.addAll(listOf("LogConditional", "IconExpectedSize", "MissingRegistered", "TypographyQuotes"))
     }
 
diff --git a/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png
index 69420d189..5ee9633e6 100644
Binary files a/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-hdpi/adventure_guide_art.png b/Habitica/res/drawable-hdpi/adventure_guide_art.png
index 5d070259e..88266a1be 100644
Binary files a/Habitica/res/drawable-hdpi/adventure_guide_art.png and b/Habitica/res/drawable-hdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-hdpi/adventure_guide_left.png b/Habitica/res/drawable-hdpi/adventure_guide_left.png
index d392ca65a..3731cb769 100644
Binary files a/Habitica/res/drawable-hdpi/adventure_guide_left.png and b/Habitica/res/drawable-hdpi/adventure_guide_left.png differ
diff --git a/Habitica/res/drawable-hdpi/adventure_guide_right.png b/Habitica/res/drawable-hdpi/adventure_guide_right.png
index 9084277fb..811d5c70b 100644
Binary files a/Habitica/res/drawable-hdpi/adventure_guide_right.png and b/Habitica/res/drawable-hdpi/adventure_guide_right.png differ
diff --git a/Habitica/res/drawable-hdpi/armoire_background.png b/Habitica/res/drawable-hdpi/armoire_background.png
index 786e741c9..df363c778 100644
Binary files a/Habitica/res/drawable-hdpi/armoire_background.png and b/Habitica/res/drawable-hdpi/armoire_background.png differ
diff --git a/Habitica/res/drawable-hdpi/armoire_circle.png b/Habitica/res/drawable-hdpi/armoire_circle.png
index 1cd176a08..e37234947 100644
Binary files a/Habitica/res/drawable-hdpi/armoire_circle.png and b/Habitica/res/drawable-hdpi/armoire_circle.png differ
diff --git a/Habitica/res/drawable-hdpi/armoire_experience.png b/Habitica/res/drawable-hdpi/armoire_experience.png
index 0cbc6046b..45731db18 100644
Binary files a/Habitica/res/drawable-hdpi/armoire_experience.png and b/Habitica/res/drawable-hdpi/armoire_experience.png differ
diff --git a/Habitica/res/drawable-hdpi/assign.png b/Habitica/res/drawable-hdpi/assign.png
index 7350842d7..7cb775b3c 100644
Binary files a/Habitica/res/drawable-hdpi/assign.png and b/Habitica/res/drawable-hdpi/assign.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_gifts.png b/Habitica/res/drawable-hdpi/birthday_gifts.png
index 107c301b2..45408a694 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_gifts.png and b/Habitica/res/drawable-hdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_header.png b/Habitica/res/drawable-hdpi/birthday_header.png
index b0d7a4fce..8a6d29f23 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_header.png and b/Habitica/res/drawable-hdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_menu_gems.png b/Habitica/res/drawable-hdpi/birthday_menu_gems.png
index 04d168809..cd5b0a2d8 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_menu_gems.png and b/Habitica/res/drawable-hdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_menu_text.png b/Habitica/res/drawable-hdpi/birthday_menu_text.png
index 891d0b5f6..4d32a1d64 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_menu_text.png and b/Habitica/res/drawable-hdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_textdeco_left.png b/Habitica/res/drawable-hdpi/birthday_textdeco_left.png
index ddb2ccda2..dd170cdbd 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-hdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_textdeco_right.png b/Habitica/res/drawable-hdpi/birthday_textdeco_right.png
index 06dfcfd7b..32c0a850c 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-hdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png
index 3c5f373ce..a1d60a730 100644
Binary files a/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-hdpi/checkmark_small.png b/Habitica/res/drawable-hdpi/checkmark_small.png
index c23aec127..b9b621b01 100644
Binary files a/Habitica/res/drawable-hdpi/checkmark_small.png and b/Habitica/res/drawable-hdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-hdpi/contributor_icon.png b/Habitica/res/drawable-hdpi/contributor_icon.png
index a7b6892e7..62973544f 100644
Binary files a/Habitica/res/drawable-hdpi/contributor_icon.png and b/Habitica/res/drawable-hdpi/contributor_icon.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png
index 0a7ac2a6b..5df493c36 100644
Binary files a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png differ
diff --git a/Habitica/res/drawable-hdpi/customization_background.png b/Habitica/res/drawable-hdpi/customization_background.png
index 898b3976f..4421320fb 100644
Binary files a/Habitica/res/drawable-hdpi/customization_background.png and b/Habitica/res/drawable-hdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-hdpi/customization_mix.png b/Habitica/res/drawable-hdpi/customization_mix.png
index eeaa15008..e22f03ba0 100644
Binary files a/Habitica/res/drawable-hdpi/customization_mix.png and b/Habitica/res/drawable-hdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-hdpi/diamond_button_white.9.png b/Habitica/res/drawable-hdpi/diamond_button_white.9.png
index f9f657f99..ce13f3b4d 100644
Binary files a/Habitica/res/drawable-hdpi/diamond_button_white.9.png and b/Habitica/res/drawable-hdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-hdpi/empty_slot.png b/Habitica/res/drawable-hdpi/empty_slot.png
index 13eec4f21..50dc71363 100644
Binary files a/Habitica/res/drawable-hdpi/empty_slot.png and b/Habitica/res/drawable-hdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-hdpi/extra_gem_cap_left.png b/Habitica/res/drawable-hdpi/extra_gem_cap_left.png
index 77687431c..6d195f1d0 100644
Binary files a/Habitica/res/drawable-hdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-hdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-hdpi/extra_gem_cap_right.png b/Habitica/res/drawable-hdpi/extra_gem_cap_right.png
index 8339d0c60..e0fd2a396 100644
Binary files a/Habitica/res/drawable-hdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-hdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_21.png b/Habitica/res/drawable-hdpi/fall_gems_21.png
index f766d9486..bef48ecf1 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_21.png and b/Habitica/res/drawable-hdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_4.png b/Habitica/res/drawable-hdpi/fall_gems_4.png
index 8c09f0cd5..1891c5c7d 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_4.png and b/Habitica/res/drawable-hdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_42.png b/Habitica/res/drawable-hdpi/fall_gems_42.png
index 7025fcba3..fcc6b0f40 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_42.png and b/Habitica/res/drawable-hdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_84.png b/Habitica/res/drawable-hdpi/fall_gems_84.png
index e5409b7fc..30e9af878 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_84.png and b/Habitica/res/drawable-hdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_promo_title.png b/Habitica/res/drawable-hdpi/fall_promo_title.png
index 14bb37c52..5e85626ca 100644
Binary files a/Habitica/res/drawable-hdpi/fall_promo_title.png and b/Habitica/res/drawable-hdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-hdpi/flag_flap.png b/Habitica/res/drawable-hdpi/flag_flap.png
index e67ac259f..2ceefd3e7 100644
Binary files a/Habitica/res/drawable-hdpi/flag_flap.png and b/Habitica/res/drawable-hdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png
index 96f5d9fa3..12959c0d1 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_right.png
index fc31a9285..aac2b88e5 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png
index 8c3b33645..4495d2202 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png
index 917c06821..3a941253a 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-hdpi/gem_footer.png b/Habitica/res/drawable-hdpi/gem_footer.png
index de0e245d4..85ba6a6ed 100644
Binary files a/Habitica/res/drawable-hdpi/gem_footer.png and b/Habitica/res/drawable-hdpi/gem_footer.png differ
diff --git a/Habitica/res/drawable-hdpi/gem_gold_left.png b/Habitica/res/drawable-hdpi/gem_gold_left.png
index 1ddd560c5..78a2461b9 100644
Binary files a/Habitica/res/drawable-hdpi/gem_gold_left.png and b/Habitica/res/drawable-hdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-hdpi/gem_gold_right.png b/Habitica/res/drawable-hdpi/gem_gold_right.png
index bd25070bc..3f10c01d6 100644
Binary files a/Habitica/res/drawable-hdpi/gem_gold_right.png and b/Habitica/res/drawable-hdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_21.png b/Habitica/res/drawable-hdpi/gems_21.png
index a391879cc..b32d0a122 100644
Binary files a/Habitica/res/drawable-hdpi/gems_21.png and b/Habitica/res/drawable-hdpi/gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_4.png b/Habitica/res/drawable-hdpi/gems_4.png
index 15cadf5f9..deb5b8e50 100644
Binary files a/Habitica/res/drawable-hdpi/gems_4.png and b/Habitica/res/drawable-hdpi/gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_42.png b/Habitica/res/drawable-hdpi/gems_42.png
index b3ac79b72..dbfb8fe61 100644
Binary files a/Habitica/res/drawable-hdpi/gems_42.png and b/Habitica/res/drawable-hdpi/gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_84.png b/Habitica/res/drawable-hdpi/gems_84.png
index cebdba72d..4c3dfdb5e 100644
Binary files a/Habitica/res/drawable-hdpi/gems_84.png and b/Habitica/res/drawable-hdpi/gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/gift_sub_gift.png b/Habitica/res/drawable-hdpi/gift_sub_gift.png
index 5cacbeb60..16226de8f 100644
Binary files a/Habitica/res/drawable-hdpi/gift_sub_gift.png and b/Habitica/res/drawable-hdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-hdpi/gift_subscription_bg.png b/Habitica/res/drawable-hdpi/gift_subscription_bg.png
index b55e65035..610fd6a52 100644
Binary files a/Habitica/res/drawable-hdpi/gift_subscription_bg.png and b/Habitica/res/drawable-hdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-hdpi/gold_coins_left.png b/Habitica/res/drawable-hdpi/gold_coins_left.png
index f1e0e5b91..99d7d073c 100644
Binary files a/Habitica/res/drawable-hdpi/gold_coins_left.png and b/Habitica/res/drawable-hdpi/gold_coins_left.png differ
diff --git a/Habitica/res/drawable-hdpi/gold_coins_right.png b/Habitica/res/drawable-hdpi/gold_coins_right.png
index 733f64877..c8cb53a77 100644
Binary files a/Habitica/res/drawable-hdpi/gold_coins_right.png and b/Habitica/res/drawable-hdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-hdpi/hourglass_fancy_left.png b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png
index bff338276..6606c71d5 100644
Binary files a/Habitica/res/drawable-hdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_add_white_18dp.png b/Habitica/res/drawable-hdpi/ic_add_white_18dp.png
index bfccb5195..598139d62 100644
Binary files a/Habitica/res/drawable-hdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-hdpi/ic_add_white_18dp.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_birthday.png b/Habitica/res/drawable-hdpi/icon_birthday.png
index de0b86208..4cba17f86 100644
Binary files a/Habitica/res/drawable-hdpi/icon_birthday.png and b/Habitica/res/drawable-hdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_boss_health.png b/Habitica/res/drawable-hdpi/icon_boss_health.png
index 8c42c61a5..de71e8e76 100644
Binary files a/Habitica/res/drawable-hdpi/icon_boss_health.png and b/Habitica/res/drawable-hdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_boss_rage.png b/Habitica/res/drawable-hdpi/icon_boss_rage.png
index a0527dec0..c7e0d227c 100644
Binary files a/Habitica/res/drawable-hdpi/icon_boss_rage.png and b/Habitica/res/drawable-hdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_eggs.png b/Habitica/res/drawable-hdpi/icon_eggs.png
index b2fd0cb57..28d622e55 100644
Binary files a/Habitica/res/drawable-hdpi/icon_eggs.png and b/Habitica/res/drawable-hdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_food.png b/Habitica/res/drawable-hdpi/icon_food.png
index d4ad2f7e5..71f8cc10c 100644
Binary files a/Habitica/res/drawable-hdpi/icon_food.png and b/Habitica/res/drawable-hdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_hatchingpotions.png b/Habitica/res/drawable-hdpi/icon_hatchingpotions.png
index cac75518b..38e366bcf 100644
Binary files a/Habitica/res/drawable-hdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-hdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_lock.png b/Habitica/res/drawable-hdpi/icon_lock.png
index e83bc8636..3960a21e0 100644
Binary files a/Habitica/res/drawable-hdpi/icon_lock.png and b/Habitica/res/drawable-hdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_messages.png b/Habitica/res/drawable-hdpi/icon_messages.png
index b68875367..517d615db 100644
Binary files a/Habitica/res/drawable-hdpi/icon_messages.png and b/Habitica/res/drawable-hdpi/icon_messages.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_quests.png b/Habitica/res/drawable-hdpi/icon_quests.png
index f8dfab6ab..451891f51 100644
Binary files a/Habitica/res/drawable-hdpi/icon_quests.png and b/Habitica/res/drawable-hdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_shops.png b/Habitica/res/drawable-hdpi/icon_shops.png
index 26cd85f34..0ec7855f8 100644
Binary files a/Habitica/res/drawable-hdpi/icon_shops.png and b/Habitica/res/drawable-hdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_special.png b/Habitica/res/drawable-hdpi/icon_special.png
index 98021f474..877dcf6db 100644
Binary files a/Habitica/res/drawable-hdpi/icon_special.png and b/Habitica/res/drawable-hdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-hdpi/indicator_subscribe.png b/Habitica/res/drawable-hdpi/indicator_subscribe.png
index 9ffc0beee..c6dbe30ef 100644
Binary files a/Habitica/res/drawable-hdpi/indicator_subscribe.png and b/Habitica/res/drawable-hdpi/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-hdpi/limited.png b/Habitica/res/drawable-hdpi/limited.png
index 06a7eb218..a5a53e20c 100644
Binary files a/Habitica/res/drawable-hdpi/limited.png and b/Habitica/res/drawable-hdpi/limited.png differ
diff --git a/Habitica/res/drawable-hdpi/looking_for_party_empty.png b/Habitica/res/drawable-hdpi/looking_for_party_empty.png
index b9acf1933..d27eb88ea 100644
Binary files a/Habitica/res/drawable-hdpi/looking_for_party_empty.png and b/Habitica/res/drawable-hdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-hdpi/npc_gradient.png b/Habitica/res/drawable-hdpi/npc_gradient.png
index 3c6ba82bc..5065b7b89 100644
Binary files a/Habitica/res/drawable-hdpi/npc_gradient.png and b/Habitica/res/drawable-hdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-hdpi/payment_gift.png b/Habitica/res/drawable-hdpi/payment_gift.png
index 2b9716bca..f7d3f4409 100644
Binary files a/Habitica/res/drawable-hdpi/payment_gift.png and b/Habitica/res/drawable-hdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-hdpi/separator_fancy.png b/Habitica/res/drawable-hdpi/separator_fancy.png
index 547a3d4ff..8bfeda35c 100644
Binary files a/Habitica/res/drawable-hdpi/separator_fancy.png and b/Habitica/res/drawable-hdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-hdpi/shop_header_sparkle.png b/Habitica/res/drawable-hdpi/shop_header_sparkle.png
index b2c3dd568..abb593112 100644
Binary files a/Habitica/res/drawable-hdpi/shop_header_sparkle.png and b/Habitica/res/drawable-hdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_21.png b/Habitica/res/drawable-hdpi/spooky_gems_21.png
index 3a17e23c9..1e9d50876 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_21.png and b/Habitica/res/drawable-hdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_4.png b/Habitica/res/drawable-hdpi/spooky_gems_4.png
index 479663474..f89624e31 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_4.png and b/Habitica/res/drawable-hdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_42.png b/Habitica/res/drawable-hdpi/spooky_gems_42.png
index 8434f2cc5..4508d8c9a 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_42.png and b/Habitica/res/drawable-hdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_84.png b/Habitica/res/drawable-hdpi/spooky_gems_84.png
index fc52ff518..6758e065f 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_84.png and b/Habitica/res/drawable-hdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_armoire.png b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png
index 7610b85a7..fa8003762 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_faint.png b/Habitica/res/drawable-hdpi/sub_benefits_faint.png
index 5bda4304b..a8e75bedb 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_faint.png and b/Habitica/res/drawable-hdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_gems.png b/Habitica/res/drawable-hdpi/sub_benefits_gems.png
index 2fe4ba4a3..3d3922cb2 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_gems.png and b/Habitica/res/drawable-hdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png
index 629b818c8..2f09dc795 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_pet.png b/Habitica/res/drawable-hdpi/sub_benefits_pet.png
index 7470f53ea..67c765b3f 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_pet.png and b/Habitica/res/drawable-hdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_plus.png b/Habitica/res/drawable-hdpi/sub_plus.png
index 6ca472fa0..540d02475 100644
Binary files a/Habitica/res/drawable-hdpi/sub_plus.png and b/Habitica/res/drawable-hdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-hdpi/subscriber_banner_dark.png b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png
index 516e0f92f..b50bf131d 100644
Binary files a/Habitica/res/drawable-hdpi/subscriber_banner_dark.png and b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-hdpi/subscription_bg.png b/Habitica/res/drawable-hdpi/subscription_bg.png
index 8e6b8b427..7890ee227 100644
Binary files a/Habitica/res/drawable-hdpi/subscription_bg.png and b/Habitica/res/drawable-hdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-hdpi/subscription_promo_gold.png b/Habitica/res/drawable-hdpi/subscription_promo_gold.png
index 81f74fe13..e1c3a7bea 100644
Binary files a/Habitica/res/drawable-hdpi/subscription_promo_gold.png and b/Habitica/res/drawable-hdpi/subscription_promo_gold.png differ
diff --git a/Habitica/res/drawable-hdpi/subscription_selected_indicator.png b/Habitica/res/drawable-hdpi/subscription_selected_indicator.png
index af84be92b..d621d0652 100644
Binary files a/Habitica/res/drawable-hdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-hdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-hdpi/survey_art_left.png b/Habitica/res/drawable-hdpi/survey_art_left.png
index 0edf01c36..ab7873687 100644
Binary files a/Habitica/res/drawable-hdpi/survey_art_left.png and b/Habitica/res/drawable-hdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png
index 6f24923b6..725c8026a 100644
Binary files a/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-mdpi/adventure_guide_art.png b/Habitica/res/drawable-mdpi/adventure_guide_art.png
index a61511181..9801480e8 100644
Binary files a/Habitica/res/drawable-mdpi/adventure_guide_art.png and b/Habitica/res/drawable-mdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-mdpi/arrow_back.png b/Habitica/res/drawable-mdpi/arrow_back.png
index 5a6ce17d7..ace7c756c 100644
Binary files a/Habitica/res/drawable-mdpi/arrow_back.png and b/Habitica/res/drawable-mdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-mdpi/assign.png b/Habitica/res/drawable-mdpi/assign.png
index 20b6a498e..7e35c5270 100644
Binary files a/Habitica/res/drawable-mdpi/assign.png and b/Habitica/res/drawable-mdpi/assign.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_gifts.png b/Habitica/res/drawable-mdpi/birthday_gifts.png
index 107c301b2..45408a694 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_gifts.png and b/Habitica/res/drawable-mdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_header.png b/Habitica/res/drawable-mdpi/birthday_header.png
index f0807b1b0..c601763bb 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_header.png and b/Habitica/res/drawable-mdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_menu_gems.png b/Habitica/res/drawable-mdpi/birthday_menu_gems.png
index 2a64b0505..21b3ec611 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_menu_gems.png and b/Habitica/res/drawable-mdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_menu_text.png b/Habitica/res/drawable-mdpi/birthday_menu_text.png
index 5900a3063..95f02527f 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_menu_text.png and b/Habitica/res/drawable-mdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_textdeco_left.png b/Habitica/res/drawable-mdpi/birthday_textdeco_left.png
index 6375fcd64..fbf01c101 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-mdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_textdeco_right.png b/Habitica/res/drawable-mdpi/birthday_textdeco_right.png
index eaff13566..9acdfd86e 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-mdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-mdpi/checkmark_small.png b/Habitica/res/drawable-mdpi/checkmark_small.png
index 8365cc635..d41f09f15 100644
Binary files a/Habitica/res/drawable-mdpi/checkmark_small.png and b/Habitica/res/drawable-mdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-mdpi/cloud_1.png b/Habitica/res/drawable-mdpi/cloud_1.png
index b67075dc4..361910ab9 100644
Binary files a/Habitica/res/drawable-mdpi/cloud_1.png and b/Habitica/res/drawable-mdpi/cloud_1.png differ
diff --git a/Habitica/res/drawable-mdpi/completed.png b/Habitica/res/drawable-mdpi/completed.png
index 128347272..724283bdf 100644
Binary files a/Habitica/res/drawable-mdpi/completed.png and b/Habitica/res/drawable-mdpi/completed.png differ
diff --git a/Habitica/res/drawable-mdpi/contributor_icon.png b/Habitica/res/drawable-mdpi/contributor_icon.png
index 3c0559b9f..0efaf3b60 100644
Binary files a/Habitica/res/drawable-mdpi/contributor_icon.png and b/Habitica/res/drawable-mdpi/contributor_icon.png differ
diff --git a/Habitica/res/drawable-mdpi/customization_background.png b/Habitica/res/drawable-mdpi/customization_background.png
index 5e7dcae61..6d448aef7 100644
Binary files a/Habitica/res/drawable-mdpi/customization_background.png and b/Habitica/res/drawable-mdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-mdpi/customization_mix.png b/Habitica/res/drawable-mdpi/customization_mix.png
index 0dd5aa4cf..43886ca14 100644
Binary files a/Habitica/res/drawable-mdpi/customization_mix.png and b/Habitica/res/drawable-mdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-mdpi/diamond_button.9.png b/Habitica/res/drawable-mdpi/diamond_button.9.png
index b1fec171b..738a50f8b 100644
Binary files a/Habitica/res/drawable-mdpi/diamond_button.9.png and b/Habitica/res/drawable-mdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-mdpi/diamond_button_white.9.png b/Habitica/res/drawable-mdpi/diamond_button_white.9.png
index 40a72bd90..b35c9c546 100644
Binary files a/Habitica/res/drawable-mdpi/diamond_button_white.9.png and b/Habitica/res/drawable-mdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-mdpi/empty_slot.png b/Habitica/res/drawable-mdpi/empty_slot.png
index 3dd8e85fc..a28f660ee 100644
Binary files a/Habitica/res/drawable-mdpi/empty_slot.png and b/Habitica/res/drawable-mdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-mdpi/extra_gem_cap_left.png b/Habitica/res/drawable-mdpi/extra_gem_cap_left.png
index 062a3996c..258fdd537 100644
Binary files a/Habitica/res/drawable-mdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-mdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-mdpi/extra_gem_cap_right.png b/Habitica/res/drawable-mdpi/extra_gem_cap_right.png
index 132499cad..843b5e65d 100644
Binary files a/Habitica/res/drawable-mdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-mdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-mdpi/fall_promo_title.png b/Habitica/res/drawable-mdpi/fall_promo_title.png
index d00a79cbb..7fa1484a5 100644
Binary files a/Habitica/res/drawable-mdpi/fall_promo_title.png and b/Habitica/res/drawable-mdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_base.png b/Habitica/res/drawable-mdpi/feed_base.png
index da6110c19..ef8f1f327 100644
Binary files a/Habitica/res/drawable-mdpi/feed_base.png and b/Habitica/res/drawable-mdpi/feed_base.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_blue.png b/Habitica/res/drawable-mdpi/feed_blue.png
index 59450f890..2a29d39e5 100644
Binary files a/Habitica/res/drawable-mdpi/feed_blue.png and b/Habitica/res/drawable-mdpi/feed_blue.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_desert.png b/Habitica/res/drawable-mdpi/feed_desert.png
index 218fcfd4f..512578087 100644
Binary files a/Habitica/res/drawable-mdpi/feed_desert.png and b/Habitica/res/drawable-mdpi/feed_desert.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_golden.png b/Habitica/res/drawable-mdpi/feed_golden.png
index b3d7856be..c0664c25d 100644
Binary files a/Habitica/res/drawable-mdpi/feed_golden.png and b/Habitica/res/drawable-mdpi/feed_golden.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_pink.png b/Habitica/res/drawable-mdpi/feed_pink.png
index 03ed882ce..33ee4c1ef 100644
Binary files a/Habitica/res/drawable-mdpi/feed_pink.png and b/Habitica/res/drawable-mdpi/feed_pink.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_red.png b/Habitica/res/drawable-mdpi/feed_red.png
index 322ca2a3f..2c2be50bf 100644
Binary files a/Habitica/res/drawable-mdpi/feed_red.png and b/Habitica/res/drawable-mdpi/feed_red.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_saddle.png b/Habitica/res/drawable-mdpi/feed_saddle.png
index 687142fb1..fb88f034c 100644
Binary files a/Habitica/res/drawable-mdpi/feed_saddle.png and b/Habitica/res/drawable-mdpi/feed_saddle.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_shade.png b/Habitica/res/drawable-mdpi/feed_shade.png
index c73a90c51..83ebaf29e 100644
Binary files a/Habitica/res/drawable-mdpi/feed_shade.png and b/Habitica/res/drawable-mdpi/feed_shade.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_skeleton.png b/Habitica/res/drawable-mdpi/feed_skeleton.png
index 2906d3b38..2e86b5e33 100644
Binary files a/Habitica/res/drawable-mdpi/feed_skeleton.png and b/Habitica/res/drawable-mdpi/feed_skeleton.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_white.png b/Habitica/res/drawable-mdpi/feed_white.png
index 0465dab6d..98715dff4 100644
Binary files a/Habitica/res/drawable-mdpi/feed_white.png and b/Habitica/res/drawable-mdpi/feed_white.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_zombie.png b/Habitica/res/drawable-mdpi/feed_zombie.png
index 0f21364fb..c51b94e27 100644
Binary files a/Habitica/res/drawable-mdpi/feed_zombie.png and b/Habitica/res/drawable-mdpi/feed_zombie.png differ
diff --git a/Habitica/res/drawable-mdpi/flag_flap.png b/Habitica/res/drawable-mdpi/flag_flap.png
index fbf095f59..44f7e10de 100644
Binary files a/Habitica/res/drawable-mdpi/flag_flap.png and b/Habitica/res/drawable-mdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png
index 31dd195cd..f07035c5f 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png
index a277e90cf..6eb23a082 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_right.png
index 30cf6ebff..2acc53d5d 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png
index f78e0afa4..8652c7be1 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png
index e761fd38f..7d52e7aa2 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png
index 1ed05c97d..c6686e154 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-mdpi/gem_gold_left.png b/Habitica/res/drawable-mdpi/gem_gold_left.png
index a24dd4b00..c383fd2c9 100644
Binary files a/Habitica/res/drawable-mdpi/gem_gold_left.png and b/Habitica/res/drawable-mdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-mdpi/gem_gold_right.png b/Habitica/res/drawable-mdpi/gem_gold_right.png
index bb9383d4f..7a9703dc4 100644
Binary files a/Habitica/res/drawable-mdpi/gem_gold_right.png and b/Habitica/res/drawable-mdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png
index 8671dae77..f235e1c69 100644
Binary files a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-mdpi/gift_sub_gift.png b/Habitica/res/drawable-mdpi/gift_sub_gift.png
index 694da1399..633b3bfb8 100644
Binary files a/Habitica/res/drawable-mdpi/gift_sub_gift.png and b/Habitica/res/drawable-mdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-mdpi/gift_subscription_bg.png b/Habitica/res/drawable-mdpi/gift_subscription_bg.png
index ebd0a34ea..9e1e932c5 100644
Binary files a/Habitica/res/drawable-mdpi/gift_subscription_bg.png and b/Habitica/res/drawable-mdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-mdpi/gold_coins_right.png b/Habitica/res/drawable-mdpi/gold_coins_right.png
index 0ced28cff..5c564ff65 100644
Binary files a/Habitica/res/drawable-mdpi/gold_coins_right.png and b/Habitica/res/drawable-mdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_left.png b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png
index a6ff670ea..ac2a94e28 100644
Binary files a/Habitica/res/drawable-mdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_right.png b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png
index 292f8099e..58a632589 100644
Binary files a/Habitica/res/drawable-mdpi/hourglass_fancy_right.png and b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png
index 6b77b8224..3d9ba7f24 100644
Binary files a/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_birthday.png b/Habitica/res/drawable-mdpi/icon_birthday.png
index ca27379e5..03913d802 100644
Binary files a/Habitica/res/drawable-mdpi/icon_birthday.png and b/Habitica/res/drawable-mdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_boss_health.png b/Habitica/res/drawable-mdpi/icon_boss_health.png
index 764c499f8..b8209da5f 100644
Binary files a/Habitica/res/drawable-mdpi/icon_boss_health.png and b/Habitica/res/drawable-mdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_boss_rage.png b/Habitica/res/drawable-mdpi/icon_boss_rage.png
index 9dd9fe767..9f4b1d997 100644
Binary files a/Habitica/res/drawable-mdpi/icon_boss_rage.png and b/Habitica/res/drawable-mdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_eggs.png b/Habitica/res/drawable-mdpi/icon_eggs.png
index 1a3a58ebb..65c40edff 100644
Binary files a/Habitica/res/drawable-mdpi/icon_eggs.png and b/Habitica/res/drawable-mdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_food.png b/Habitica/res/drawable-mdpi/icon_food.png
index cd8b8fc38..a05781a84 100644
Binary files a/Habitica/res/drawable-mdpi/icon_food.png and b/Habitica/res/drawable-mdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_gift_subscription.png b/Habitica/res/drawable-mdpi/icon_gift_subscription.png
index a44156262..b4ddaa45d 100644
Binary files a/Habitica/res/drawable-mdpi/icon_gift_subscription.png and b/Habitica/res/drawable-mdpi/icon_gift_subscription.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_hatchingpotions.png b/Habitica/res/drawable-mdpi/icon_hatchingpotions.png
index 1483a1693..2489e4ff7 100644
Binary files a/Habitica/res/drawable-mdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-mdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_lock.png b/Habitica/res/drawable-mdpi/icon_lock.png
index 181b86336..d4d1f926a 100644
Binary files a/Habitica/res/drawable-mdpi/icon_lock.png and b/Habitica/res/drawable-mdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_quests.png b/Habitica/res/drawable-mdpi/icon_quests.png
index 9e18dae9c..3f2c69772 100644
Binary files a/Habitica/res/drawable-mdpi/icon_quests.png and b/Habitica/res/drawable-mdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_shops.png b/Habitica/res/drawable-mdpi/icon_shops.png
index 7ae1882c1..6462cf19c 100644
Binary files a/Habitica/res/drawable-mdpi/icon_shops.png and b/Habitica/res/drawable-mdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_special.png b/Habitica/res/drawable-mdpi/icon_special.png
index 191f7ecdd..73e6d037c 100644
Binary files a/Habitica/res/drawable-mdpi/icon_special.png and b/Habitica/res/drawable-mdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-mdpi/justin_textbox.png b/Habitica/res/drawable-mdpi/justin_textbox.png
index 1142419d4..06785edf9 100644
Binary files a/Habitica/res/drawable-mdpi/justin_textbox.png and b/Habitica/res/drawable-mdpi/justin_textbox.png differ
diff --git a/Habitica/res/drawable-mdpi/limited.png b/Habitica/res/drawable-mdpi/limited.png
index 47bfbef16..ce7223101 100644
Binary files a/Habitica/res/drawable-mdpi/limited.png and b/Habitica/res/drawable-mdpi/limited.png differ
diff --git a/Habitica/res/drawable-mdpi/looking_for_party_empty.png b/Habitica/res/drawable-mdpi/looking_for_party_empty.png
index 4437f521e..9ffddc15d 100644
Binary files a/Habitica/res/drawable-mdpi/looking_for_party_empty.png and b/Habitica/res/drawable-mdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-mdpi/npc_gradient.png b/Habitica/res/drawable-mdpi/npc_gradient.png
index fedf7e5b9..a3caa26ee 100644
Binary files a/Habitica/res/drawable-mdpi/npc_gradient.png and b/Habitica/res/drawable-mdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-mdpi/onboarding_done_art.png b/Habitica/res/drawable-mdpi/onboarding_done_art.png
index 960b76e86..64efa33b0 100644
Binary files a/Habitica/res/drawable-mdpi/onboarding_done_art.png and b/Habitica/res/drawable-mdpi/onboarding_done_art.png differ
diff --git a/Habitica/res/drawable-mdpi/payment_gift.png b/Habitica/res/drawable-mdpi/payment_gift.png
index 527420f50..61576352f 100644
Binary files a/Habitica/res/drawable-mdpi/payment_gift.png and b/Habitica/res/drawable-mdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-mdpi/separator_fancy.png b/Habitica/res/drawable-mdpi/separator_fancy.png
index a71f3c720..5d7c9694a 100644
Binary files a/Habitica/res/drawable-mdpi/separator_fancy.png and b/Habitica/res/drawable-mdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-mdpi/shop_header_sparkle.png b/Habitica/res/drawable-mdpi/shop_header_sparkle.png
index ad5159125..74a559ee5 100644
Binary files a/Habitica/res/drawable-mdpi/shop_header_sparkle.png and b/Habitica/res/drawable-mdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-mdpi/spooky_promo_info_right.png b/Habitica/res/drawable-mdpi/spooky_promo_info_right.png
index 54f2dbef6..e5f542f54 100644
Binary files a/Habitica/res/drawable-mdpi/spooky_promo_info_right.png and b/Habitica/res/drawable-mdpi/spooky_promo_info_right.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_april.png b/Habitica/res/drawable-mdpi/stable_tile_april.png
index d5cd1e021..945b7fa9a 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_april.png and b/Habitica/res/drawable-mdpi/stable_tile_april.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_august.png b/Habitica/res/drawable-mdpi/stable_tile_august.png
index 29afec140..719c82dde 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_august.png and b/Habitica/res/drawable-mdpi/stable_tile_august.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_december.png b/Habitica/res/drawable-mdpi/stable_tile_december.png
index cf8678da0..a31d02e71 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_december.png and b/Habitica/res/drawable-mdpi/stable_tile_december.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_february.png b/Habitica/res/drawable-mdpi/stable_tile_february.png
index bfaf85ede..43dd03a1d 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_february.png and b/Habitica/res/drawable-mdpi/stable_tile_february.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_janurary.png b/Habitica/res/drawable-mdpi/stable_tile_janurary.png
index 6a84632c6..0c9d9d8c4 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_janurary.png and b/Habitica/res/drawable-mdpi/stable_tile_janurary.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_july.png b/Habitica/res/drawable-mdpi/stable_tile_july.png
index 371d7e5e4..8031d532e 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_july.png and b/Habitica/res/drawable-mdpi/stable_tile_july.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_june.png b/Habitica/res/drawable-mdpi/stable_tile_june.png
index aaea748e0..fe5bd7df0 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_june.png and b/Habitica/res/drawable-mdpi/stable_tile_june.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_march.png b/Habitica/res/drawable-mdpi/stable_tile_march.png
index 393d6a665..8a9cefd3f 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_march.png and b/Habitica/res/drawable-mdpi/stable_tile_march.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_may.png b/Habitica/res/drawable-mdpi/stable_tile_may.png
index bb017c40b..1567de282 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_may.png and b/Habitica/res/drawable-mdpi/stable_tile_may.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_november.png b/Habitica/res/drawable-mdpi/stable_tile_november.png
index 565958f4e..4c3907d5c 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_november.png and b/Habitica/res/drawable-mdpi/stable_tile_november.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_october.png b/Habitica/res/drawable-mdpi/stable_tile_october.png
index 7841588a5..16f9e512d 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_october.png and b/Habitica/res/drawable-mdpi/stable_tile_october.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_september.png b/Habitica/res/drawable-mdpi/stable_tile_september.png
index e6faa878b..bf7223a36 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_september.png and b/Habitica/res/drawable-mdpi/stable_tile_september.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_armoire.png b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png
index 5a56e6106..48aec1eb2 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_faint.png b/Habitica/res/drawable-mdpi/sub_benefits_faint.png
index b0bbc1569..9276ee4ec 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_faint.png and b/Habitica/res/drawable-mdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_gems.png b/Habitica/res/drawable-mdpi/sub_benefits_gems.png
index 7813ffe13..e66bce05d 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_gems.png and b/Habitica/res/drawable-mdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png
index d1da3835a..b1366d124 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_pet.png b/Habitica/res/drawable-mdpi/sub_benefits_pet.png
index 544b74a9e..e0338d1b3 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_pet.png and b/Habitica/res/drawable-mdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_plus.png b/Habitica/res/drawable-mdpi/sub_plus.png
index d1c1db1b8..c114da48f 100644
Binary files a/Habitica/res/drawable-mdpi/sub_plus.png and b/Habitica/res/drawable-mdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-mdpi/subscription_bg.png b/Habitica/res/drawable-mdpi/subscription_bg.png
index 3cfc3b068..4a85da342 100644
Binary files a/Habitica/res/drawable-mdpi/subscription_bg.png and b/Habitica/res/drawable-mdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-mdpi/subscription_selected_indicator.png b/Habitica/res/drawable-mdpi/subscription_selected_indicator.png
index 505075158..1f3f8211a 100644
Binary files a/Habitica/res/drawable-mdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-mdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-mdpi/survey_art_left.png b/Habitica/res/drawable-mdpi/survey_art_left.png
index 51eb64832..f43b08b69 100644
Binary files a/Habitica/res/drawable-mdpi/survey_art_left.png and b/Habitica/res/drawable-mdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-mdpi/survey_art_right.png b/Habitica/res/drawable-mdpi/survey_art_right.png
index 27325c199..6b6dba896 100644
Binary files a/Habitica/res/drawable-mdpi/survey_art_right.png and b/Habitica/res/drawable-mdpi/survey_art_right.png differ
diff --git a/Habitica/res/drawable-night/indicator_subscribe.png b/Habitica/res/drawable-night/indicator_subscribe.png
index 9ffc0beee..c6dbe30ef 100644
Binary files a/Habitica/res/drawable-night/indicator_subscribe.png and b/Habitica/res/drawable-night/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png
index 6d5b7a686..eb95efb17 100644
Binary files a/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_art.png b/Habitica/res/drawable-xhdpi/adventure_guide_art.png
index 9ddd2fbc0..361f59c89 100644
Binary files a/Habitica/res/drawable-xhdpi/adventure_guide_art.png and b/Habitica/res/drawable-xhdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_left.png b/Habitica/res/drawable-xhdpi/adventure_guide_left.png
index b4d69cb11..9ce4e9b80 100644
Binary files a/Habitica/res/drawable-xhdpi/adventure_guide_left.png and b/Habitica/res/drawable-xhdpi/adventure_guide_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_right.png b/Habitica/res/drawable-xhdpi/adventure_guide_right.png
index 7402a88cb..d4ff2dd3d 100644
Binary files a/Habitica/res/drawable-xhdpi/adventure_guide_right.png and b/Habitica/res/drawable-xhdpi/adventure_guide_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/armoire_background.png b/Habitica/res/drawable-xhdpi/armoire_background.png
index f8b5f68a7..091689efa 100644
Binary files a/Habitica/res/drawable-xhdpi/armoire_background.png and b/Habitica/res/drawable-xhdpi/armoire_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/armoire_circle.png b/Habitica/res/drawable-xhdpi/armoire_circle.png
index 4311171b5..269764a2f 100644
Binary files a/Habitica/res/drawable-xhdpi/armoire_circle.png and b/Habitica/res/drawable-xhdpi/armoire_circle.png differ
diff --git a/Habitica/res/drawable-xhdpi/armoire_experience.png b/Habitica/res/drawable-xhdpi/armoire_experience.png
index 1cc7e208a..bffe1a441 100644
Binary files a/Habitica/res/drawable-xhdpi/armoire_experience.png and b/Habitica/res/drawable-xhdpi/armoire_experience.png differ
diff --git a/Habitica/res/drawable-xhdpi/arrow_back.png b/Habitica/res/drawable-xhdpi/arrow_back.png
index eb2fd3b18..4ce40a745 100644
Binary files a/Habitica/res/drawable-xhdpi/arrow_back.png and b/Habitica/res/drawable-xhdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-xhdpi/assign.png b/Habitica/res/drawable-xhdpi/assign.png
index bb10ca5ef..9a3d59f94 100644
Binary files a/Habitica/res/drawable-xhdpi/assign.png and b/Habitica/res/drawable-xhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_gems.png b/Habitica/res/drawable-xhdpi/birthday_gems.png
index e93642d5e..bab5e9d5f 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_gems.png and b/Habitica/res/drawable-xhdpi/birthday_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_gifts.png b/Habitica/res/drawable-xhdpi/birthday_gifts.png
index d77d67769..3d7a59a7b 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_gifts.png and b/Habitica/res/drawable-xhdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_header.png b/Habitica/res/drawable-xhdpi/birthday_header.png
index 4478f734e..2223a56b5 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_header.png and b/Habitica/res/drawable-xhdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_menu_gems.png b/Habitica/res/drawable-xhdpi/birthday_menu_gems.png
index b283b86aa..ee38c98af 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_menu_gems.png and b/Habitica/res/drawable-xhdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_menu_text.png b/Habitica/res/drawable-xhdpi/birthday_menu_text.png
index 4c5915a3b..0edb773c1 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_menu_text.png and b/Habitica/res/drawable-xhdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png b/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png
index 63b4af0d9..f748482aa 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png b/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png
index a9144b9e2..ce128b69c 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png
index 2e5acc59b..cb4f559f0 100644
Binary files a/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-xhdpi/checkmark_small.png b/Habitica/res/drawable-xhdpi/checkmark_small.png
index 4545f631f..9efd57c26 100644
Binary files a/Habitica/res/drawable-xhdpi/checkmark_small.png and b/Habitica/res/drawable-xhdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/completed.png b/Habitica/res/drawable-xhdpi/completed.png
index 21bcf2a91..cba883db0 100644
Binary files a/Habitica/res/drawable-xhdpi/completed.png and b/Habitica/res/drawable-xhdpi/completed.png differ
diff --git a/Habitica/res/drawable-xhdpi/customization_background.png b/Habitica/res/drawable-xhdpi/customization_background.png
index 83c6baf54..41c1edb1e 100644
Binary files a/Habitica/res/drawable-xhdpi/customization_background.png and b/Habitica/res/drawable-xhdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/customization_mix.png b/Habitica/res/drawable-xhdpi/customization_mix.png
index e2f14931d..c33790524 100644
Binary files a/Habitica/res/drawable-xhdpi/customization_mix.png and b/Habitica/res/drawable-xhdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-xhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png
index c3564d0e5..266f7afd2 100644
Binary files a/Habitica/res/drawable-xhdpi/diamond_button_white.9.png and b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-xhdpi/empty_slot.png b/Habitica/res/drawable-xhdpi/empty_slot.png
index ba14ec0ac..7a1650335 100644
Binary files a/Habitica/res/drawable-xhdpi/empty_slot.png and b/Habitica/res/drawable-xhdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png b/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png
index c362404a2..6e66857dc 100644
Binary files a/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png and b/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png differ
diff --git a/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png b/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png
index 597a47570..3ea778026 100644
Binary files a/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png b/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png
index baf951bae..2114ef610 100644
Binary files a/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_21.png b/Habitica/res/drawable-xhdpi/fall_gems_21.png
index 69b81a672..00cdfc5c5 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_21.png and b/Habitica/res/drawable-xhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_4.png b/Habitica/res/drawable-xhdpi/fall_gems_4.png
index cad6e540d..b3cd76304 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_4.png and b/Habitica/res/drawable-xhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_42.png b/Habitica/res/drawable-xhdpi/fall_gems_42.png
index 02f8c8343..859a1caf8 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_42.png and b/Habitica/res/drawable-xhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_84.png b/Habitica/res/drawable-xhdpi/fall_gems_84.png
index 97768873e..375ead94d 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_84.png and b/Habitica/res/drawable-xhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_promo_title.png b/Habitica/res/drawable-xhdpi/fall_promo_title.png
index 20f5b4613..8b9fca1f7 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_promo_title.png and b/Habitica/res/drawable-xhdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-xhdpi/flag_flap.png b/Habitica/res/drawable-xhdpi/flag_flap.png
index 4cdb4a573..7a85c9a77 100644
Binary files a/Habitica/res/drawable-xhdpi/flag_flap.png and b/Habitica/res/drawable-xhdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png
index 252291e5e..a438f2158 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png
index ecd4aa36a..ea86b0b9a 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png
index 1e96e7513..3e50669a8 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png
index 04fa91802..ffcc27521 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png
index 37df461cd..6b89f67b1 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png
index ad9ba537a..6b5c59508 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png
index 46de9ec09..183300bff 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png
index 2eceaffae..1f1e6fd0d 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_footer.png b/Habitica/res/drawable-xhdpi/gem_footer.png
index c74eb76a1..537183b2b 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_footer.png and b/Habitica/res/drawable-xhdpi/gem_footer.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_gold_left.png b/Habitica/res/drawable-xhdpi/gem_gold_left.png
index cb8a9643b..3f7cea2e0 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_gold_left.png and b/Habitica/res/drawable-xhdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_gold_right.png b/Habitica/res/drawable-xhdpi/gem_gold_right.png
index a992da7ab..3102b9fc8 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_gold_right.png and b/Habitica/res/drawable-xhdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png
index 6b74258d1..309332d96 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_21.png b/Habitica/res/drawable-xhdpi/gems_21.png
index 7b847e42e..5162c8d2b 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_21.png and b/Habitica/res/drawable-xhdpi/gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_4.png b/Habitica/res/drawable-xhdpi/gems_4.png
index bc3ab9ebc..441e95989 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_4.png and b/Habitica/res/drawable-xhdpi/gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_42.png b/Habitica/res/drawable-xhdpi/gems_42.png
index 9d5e031e0..0bf63dc8f 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_42.png and b/Habitica/res/drawable-xhdpi/gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_84.png b/Habitica/res/drawable-xhdpi/gems_84.png
index c5d02e5dc..85e52f6e8 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_84.png and b/Habitica/res/drawable-xhdpi/gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/gift_sub_gift.png b/Habitica/res/drawable-xhdpi/gift_sub_gift.png
index 9ffb340e5..aef886d3e 100644
Binary files a/Habitica/res/drawable-xhdpi/gift_sub_gift.png and b/Habitica/res/drawable-xhdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-xhdpi/gift_subscription_bg.png b/Habitica/res/drawable-xhdpi/gift_subscription_bg.png
index 1eca3939d..932bc69e1 100644
Binary files a/Habitica/res/drawable-xhdpi/gift_subscription_bg.png and b/Habitica/res/drawable-xhdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-xhdpi/gold_coins_left.png b/Habitica/res/drawable-xhdpi/gold_coins_left.png
index 898a9cb8a..f760f90c9 100644
Binary files a/Habitica/res/drawable-xhdpi/gold_coins_left.png and b/Habitica/res/drawable-xhdpi/gold_coins_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/gold_coins_right.png b/Habitica/res/drawable-xhdpi/gold_coins_right.png
index 830a2b4e7..809e66ca4 100644
Binary files a/Habitica/res/drawable-xhdpi/gold_coins_right.png and b/Habitica/res/drawable-xhdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_minus.png b/Habitica/res/drawable-xhdpi/habit_minus.png
index 98d386e93..8b7d51dd1 100644
Binary files a/Habitica/res/drawable-xhdpi/habit_minus.png and b/Habitica/res/drawable-xhdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_plus.png b/Habitica/res/drawable-xhdpi/habit_plus.png
index a8a708fe4..3c80abab8 100644
Binary files a/Habitica/res/drawable-xhdpi/habit_plus.png and b/Habitica/res/drawable-xhdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png
index 855b6d3e9..eb64ef1f0 100644
Binary files a/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png
index e69459274..4f81c476d 100644
Binary files a/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png and b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png
index 3e6f53609..694179bd4 100644
Binary files a/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png
index 9a8d9d838..20085d861 100644
Binary files a/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_birthday.png b/Habitica/res/drawable-xhdpi/icon_birthday.png
index ddaa802bf..0726a0f62 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_birthday.png and b/Habitica/res/drawable-xhdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_boss_health.png b/Habitica/res/drawable-xhdpi/icon_boss_health.png
index bbd8a71a5..60464e286 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_boss_health.png and b/Habitica/res/drawable-xhdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_boss_rage.png b/Habitica/res/drawable-xhdpi/icon_boss_rage.png
index f7662ba11..b895946e6 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_boss_rage.png and b/Habitica/res/drawable-xhdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_eggs.png b/Habitica/res/drawable-xhdpi/icon_eggs.png
index 9eef23c5b..52e4c1f7c 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_eggs.png and b/Habitica/res/drawable-xhdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_food.png b/Habitica/res/drawable-xhdpi/icon_food.png
index 21850ec28..ed896ea5f 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_food.png and b/Habitica/res/drawable-xhdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_gift_gems.png b/Habitica/res/drawable-xhdpi/icon_gift_gems.png
index 072958a4a..fcef42045 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_gift_gems.png and b/Habitica/res/drawable-xhdpi/icon_gift_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png b/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png
index 6bf2d0e5c..71f6359e5 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_lock.png b/Habitica/res/drawable-xhdpi/icon_lock.png
index 70e12a938..fc59dc2ea 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_lock.png and b/Habitica/res/drawable-xhdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_quests.png b/Habitica/res/drawable-xhdpi/icon_quests.png
index e09b5fd39..2d9015164 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_quests.png and b/Habitica/res/drawable-xhdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_shops.png b/Habitica/res/drawable-xhdpi/icon_shops.png
index c9cc3e58a..cde0d2805 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_shops.png and b/Habitica/res/drawable-xhdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_special.png b/Habitica/res/drawable-xhdpi/icon_special.png
index 9f4b7f26c..f5b4465b9 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_special.png and b/Habitica/res/drawable-xhdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-xhdpi/indicator_subscribe.png b/Habitica/res/drawable-xhdpi/indicator_subscribe.png
index 84bf95ac7..4ff6d2a5b 100644
Binary files a/Habitica/res/drawable-xhdpi/indicator_subscribe.png and b/Habitica/res/drawable-xhdpi/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-xhdpi/limited.png b/Habitica/res/drawable-xhdpi/limited.png
index d1c2a21be..b09af198b 100644
Binary files a/Habitica/res/drawable-xhdpi/limited.png and b/Habitica/res/drawable-xhdpi/limited.png differ
diff --git a/Habitica/res/drawable-xhdpi/looking_for_party_empty.png b/Habitica/res/drawable-xhdpi/looking_for_party_empty.png
index 3023e1280..ad66b6f36 100644
Binary files a/Habitica/res/drawable-xhdpi/looking_for_party_empty.png and b/Habitica/res/drawable-xhdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-xhdpi/npc_gradient.png b/Habitica/res/drawable-xhdpi/npc_gradient.png
index 63a6a2096..ef7ee7c7a 100644
Binary files a/Habitica/res/drawable-xhdpi/npc_gradient.png and b/Habitica/res/drawable-xhdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-xhdpi/onboarding_done_art.png b/Habitica/res/drawable-xhdpi/onboarding_done_art.png
index 407a1bdb1..64ebcdc6b 100644
Binary files a/Habitica/res/drawable-xhdpi/onboarding_done_art.png and b/Habitica/res/drawable-xhdpi/onboarding_done_art.png differ
diff --git a/Habitica/res/drawable-xhdpi/payment_gift.png b/Habitica/res/drawable-xhdpi/payment_gift.png
index ac4799cd6..b7553901c 100644
Binary files a/Habitica/res/drawable-xhdpi/payment_gift.png and b/Habitica/res/drawable-xhdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-xhdpi/payment_stripe.png b/Habitica/res/drawable-xhdpi/payment_stripe.png
index 4dd9aba31..b2466fb68 100644
Binary files a/Habitica/res/drawable-xhdpi/payment_stripe.png and b/Habitica/res/drawable-xhdpi/payment_stripe.png differ
diff --git a/Habitica/res/drawable-xhdpi/separator_fancy.png b/Habitica/res/drawable-xhdpi/separator_fancy.png
index f35a8ad93..62123c6f2 100644
Binary files a/Habitica/res/drawable-xhdpi/separator_fancy.png and b/Habitica/res/drawable-xhdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-xhdpi/shop_header_sparkle.png b/Habitica/res/drawable-xhdpi/shop_header_sparkle.png
index 209842b32..5895aaaf2 100644
Binary files a/Habitica/res/drawable-xhdpi/shop_header_sparkle.png and b/Habitica/res/drawable-xhdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_21.png b/Habitica/res/drawable-xhdpi/spooky_gems_21.png
index c9ff5ba6b..afd201486 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_21.png and b/Habitica/res/drawable-xhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_4.png b/Habitica/res/drawable-xhdpi/spooky_gems_4.png
index 81241006e..897feba0b 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_4.png and b/Habitica/res/drawable-xhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_42.png b/Habitica/res/drawable-xhdpi/spooky_gems_42.png
index 3bce039f5..d6b2d76d3 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_42.png and b/Habitica/res/drawable-xhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_84.png b/Habitica/res/drawable-xhdpi/spooky_gems_84.png
index a8d3a378e..ea3eaf3f2 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_84.png and b/Habitica/res/drawable-xhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png
index 5ffbd7d57..faeafad19 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_faint.png b/Habitica/res/drawable-xhdpi/sub_benefits_faint.png
index c7a785969..2551fe85b 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_faint.png and b/Habitica/res/drawable-xhdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_gems.png b/Habitica/res/drawable-xhdpi/sub_benefits_gems.png
index 0f4d127d7..7040a7381 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_gems.png and b/Habitica/res/drawable-xhdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png
index f81398fef..28a03db9c 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_pet.png b/Habitica/res/drawable-xhdpi/sub_benefits_pet.png
index 83b22025c..b9d861e34 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_pet.png and b/Habitica/res/drawable-xhdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_plus.png b/Habitica/res/drawable-xhdpi/sub_plus.png
index ac5bbf974..c4102f37b 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_plus.png and b/Habitica/res/drawable-xhdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscription_bg.png b/Habitica/res/drawable-xhdpi/subscription_bg.png
index 23037e347..27c3a2591 100644
Binary files a/Habitica/res/drawable-xhdpi/subscription_bg.png and b/Habitica/res/drawable-xhdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscription_promo_gold.png b/Habitica/res/drawable-xhdpi/subscription_promo_gold.png
index 84ed86782..17ae60958 100644
Binary files a/Habitica/res/drawable-xhdpi/subscription_promo_gold.png and b/Habitica/res/drawable-xhdpi/subscription_promo_gold.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png
index f01900954..e8581e3ea 100644
Binary files a/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-xhdpi/survey_art_left.png b/Habitica/res/drawable-xhdpi/survey_art_left.png
index 6555bae8a..eb8a61b4c 100644
Binary files a/Habitica/res/drawable-xhdpi/survey_art_left.png and b/Habitica/res/drawable-xhdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_broken_megaphone.png b/Habitica/res/drawable-xhdpi/task_broken_megaphone.png
index 9a5e6294f..3d2063c2c 100644
Binary files a/Habitica/res/drawable-xhdpi/task_broken_megaphone.png and b/Habitica/res/drawable-xhdpi/task_broken_megaphone.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png
index a107821a9..37bdededf 100644
Binary files a/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_art.png b/Habitica/res/drawable-xxhdpi/adventure_guide_art.png
index fdeacdcdf..36feb214b 100644
Binary files a/Habitica/res/drawable-xxhdpi/adventure_guide_art.png and b/Habitica/res/drawable-xxhdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_left.png b/Habitica/res/drawable-xxhdpi/adventure_guide_left.png
index 802b3a727..b3cb5d6bf 100644
Binary files a/Habitica/res/drawable-xxhdpi/adventure_guide_left.png and b/Habitica/res/drawable-xxhdpi/adventure_guide_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_right.png b/Habitica/res/drawable-xxhdpi/adventure_guide_right.png
index 713ed8ff4..a44fadb00 100644
Binary files a/Habitica/res/drawable-xxhdpi/adventure_guide_right.png and b/Habitica/res/drawable-xxhdpi/adventure_guide_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/armoire_background.png b/Habitica/res/drawable-xxhdpi/armoire_background.png
index db4955ec8..0632e59f2 100644
Binary files a/Habitica/res/drawable-xxhdpi/armoire_background.png and b/Habitica/res/drawable-xxhdpi/armoire_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/armoire_circle.png b/Habitica/res/drawable-xxhdpi/armoire_circle.png
index c54039f9f..5481fa464 100644
Binary files a/Habitica/res/drawable-xxhdpi/armoire_circle.png and b/Habitica/res/drawable-xxhdpi/armoire_circle.png differ
diff --git a/Habitica/res/drawable-xxhdpi/armoire_experience.png b/Habitica/res/drawable-xxhdpi/armoire_experience.png
index 5f505e3ac..251d2510e 100644
Binary files a/Habitica/res/drawable-xxhdpi/armoire_experience.png and b/Habitica/res/drawable-xxhdpi/armoire_experience.png differ
diff --git a/Habitica/res/drawable-xxhdpi/arrow_back.png b/Habitica/res/drawable-xxhdpi/arrow_back.png
index 92e71e95d..65f6329df 100644
Binary files a/Habitica/res/drawable-xxhdpi/arrow_back.png and b/Habitica/res/drawable-xxhdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-xxhdpi/assign.png b/Habitica/res/drawable-xxhdpi/assign.png
index bf0578c8c..493747f39 100644
Binary files a/Habitica/res/drawable-xxhdpi/assign.png and b/Habitica/res/drawable-xxhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_gems.png b/Habitica/res/drawable-xxhdpi/birthday_gems.png
index 875268c4c..ea6ce0a6e 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_gems.png and b/Habitica/res/drawable-xxhdpi/birthday_gems.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_gifts.png b/Habitica/res/drawable-xxhdpi/birthday_gifts.png
index dfe56bf16..ee621360e 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_gifts.png and b/Habitica/res/drawable-xxhdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_header.png b/Habitica/res/drawable-xxhdpi/birthday_header.png
index 641778429..3f68fd3f6 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_header.png and b/Habitica/res/drawable-xxhdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png b/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png
index 1dcb0097e..5025ec99a 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png and b/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_menu_text.png b/Habitica/res/drawable-xxhdpi/birthday_menu_text.png
index e365e2274..6e078b399 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_menu_text.png and b/Habitica/res/drawable-xxhdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png b/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png
index 7e0544f67..5822c6728 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png b/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png
index 736fcbab7..f4bda60ff 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png
index 9daee8f9e..24f453fcc 100644
Binary files a/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-xxhdpi/checkmark_small.png b/Habitica/res/drawable-xxhdpi/checkmark_small.png
index d35a15dac..061f1a5de 100644
Binary files a/Habitica/res/drawable-xxhdpi/checkmark_small.png and b/Habitica/res/drawable-xxhdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/completed.png b/Habitica/res/drawable-xxhdpi/completed.png
index d84b65cb2..2f5d8b78f 100644
Binary files a/Habitica/res/drawable-xxhdpi/completed.png and b/Habitica/res/drawable-xxhdpi/completed.png differ
diff --git a/Habitica/res/drawable-xxhdpi/contributor_icon.png b/Habitica/res/drawable-xxhdpi/contributor_icon.png
index 01aa3b052..4579bdafc 100644
Binary files a/Habitica/res/drawable-xxhdpi/contributor_icon.png and b/Habitica/res/drawable-xxhdpi/contributor_icon.png differ
diff --git a/Habitica/res/drawable-xxhdpi/customization_background.png b/Habitica/res/drawable-xxhdpi/customization_background.png
index b9999cf4d..4f6b3f3f6 100644
Binary files a/Habitica/res/drawable-xxhdpi/customization_background.png and b/Habitica/res/drawable-xxhdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/customization_mix.png b/Habitica/res/drawable-xxhdpi/customization_mix.png
index 1729c7032..198e5594b 100644
Binary files a/Habitica/res/drawable-xxhdpi/customization_mix.png and b/Habitica/res/drawable-xxhdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-xxhdpi/diamond_button.9.png b/Habitica/res/drawable-xxhdpi/diamond_button.9.png
index 317538c09..9db00d747 100644
Binary files a/Habitica/res/drawable-xxhdpi/diamond_button.9.png and b/Habitica/res/drawable-xxhdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png
index 2317f8522..f307977c1 100644
Binary files a/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png and b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/empty_slot.png b/Habitica/res/drawable-xxhdpi/empty_slot.png
index 74ac9c25b..67d1d9a11 100644
Binary files a/Habitica/res/drawable-xxhdpi/empty_slot.png and b/Habitica/res/drawable-xxhdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-xxhdpi/equipment_two_handed.png b/Habitica/res/drawable-xxhdpi/equipment_two_handed.png
index 578cb397e..f1717f451 100644
Binary files a/Habitica/res/drawable-xxhdpi/equipment_two_handed.png and b/Habitica/res/drawable-xxhdpi/equipment_two_handed.png differ
diff --git a/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png b/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png
index 74b2e70ef..d14dfc591 100644
Binary files a/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png b/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png
index e19371219..5c6d6e25a 100644
Binary files a/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxhdpi/fall_gems_21.png
index 2e59c48c6..51b5ab55a 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_21.png and b/Habitica/res/drawable-xxhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxhdpi/fall_gems_4.png
index 3b54a666d..996311238 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_4.png and b/Habitica/res/drawable-xxhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxhdpi/fall_gems_42.png
index 8dd7c1aa8..9ebc2a0aa 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_42.png and b/Habitica/res/drawable-xxhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxhdpi/fall_gems_84.png
index 8757d1300..f18383a83 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_84.png and b/Habitica/res/drawable-xxhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_promo_title.png b/Habitica/res/drawable-xxhdpi/fall_promo_title.png
index 846418d8f..2a49c02fb 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_promo_title.png and b/Habitica/res/drawable-xxhdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-xxhdpi/flag_flap.png b/Habitica/res/drawable-xxhdpi/flag_flap.png
index b9d656371..ca02603af 100644
Binary files a/Habitica/res/drawable-xxhdpi/flag_flap.png and b/Habitica/res/drawable-xxhdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png
index 0db595070..9dbb03c00 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png
index 2a7e4472c..484b54d76 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png
index 3a6730ad1..de15d7eb0 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png
index 7c77ff9b2..4409f987d 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png
index c704cc43e..86ad00159 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png
index 9a608b8e9..f0e644d4f 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_footer.png b/Habitica/res/drawable-xxhdpi/gem_footer.png
index 3df5c85ad..cd25fd630 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_footer.png and b/Habitica/res/drawable-xxhdpi/gem_footer.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_gold_left.png b/Habitica/res/drawable-xxhdpi/gem_gold_left.png
index 4321b394b..7d71c80fb 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_gold_left.png and b/Habitica/res/drawable-xxhdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_gold_right.png b/Habitica/res/drawable-xxhdpi/gem_gold_right.png
index 6bd13abf9..84ce13156 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_gold_right.png and b/Habitica/res/drawable-xxhdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header.png
index bbeafadfc..9ce6c5f34 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_purchase_header.png and b/Habitica/res/drawable-xxhdpi/gem_purchase_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png
index e31809027..2d28aa92f 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_21.png b/Habitica/res/drawable-xxhdpi/gems_21.png
index ad89c7759..a9d796129 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_21.png and b/Habitica/res/drawable-xxhdpi/gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_4.png b/Habitica/res/drawable-xxhdpi/gems_4.png
index f18f173a6..62cc2a8f1 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_4.png and b/Habitica/res/drawable-xxhdpi/gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_42.png b/Habitica/res/drawable-xxhdpi/gems_42.png
index 033c88781..c2966c312 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_42.png and b/Habitica/res/drawable-xxhdpi/gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_84.png b/Habitica/res/drawable-xxhdpi/gems_84.png
index 815987af1..82b29c445 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_84.png and b/Habitica/res/drawable-xxhdpi/gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gift_sub_gift.png b/Habitica/res/drawable-xxhdpi/gift_sub_gift.png
index a154b401f..38ca925b9 100644
Binary files a/Habitica/res/drawable-xxhdpi/gift_sub_gift.png and b/Habitica/res/drawable-xxhdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png b/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png
index 0e66be2cd..d8ed80ff0 100644
Binary files a/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png and b/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_coins_left.png b/Habitica/res/drawable-xxhdpi/gold_coins_left.png
index e1caf33d6..a516a5e00 100644
Binary files a/Habitica/res/drawable-xxhdpi/gold_coins_left.png and b/Habitica/res/drawable-xxhdpi/gold_coins_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_coins_right.png b/Habitica/res/drawable-xxhdpi/gold_coins_right.png
index ebd64b89e..99d70c64d 100644
Binary files a/Habitica/res/drawable-xxhdpi/gold_coins_right.png and b/Habitica/res/drawable-xxhdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_minus.png b/Habitica/res/drawable-xxhdpi/habit_minus.png
index 03c457811..a4e60765b 100644
Binary files a/Habitica/res/drawable-xxhdpi/habit_minus.png and b/Habitica/res/drawable-xxhdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_plus.png b/Habitica/res/drawable-xxhdpi/habit_plus.png
index 6609fef8c..7f1db95aa 100644
Binary files a/Habitica/res/drawable-xxhdpi/habit_plus.png and b/Habitica/res/drawable-xxhdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png
index 521fbe768..a99d877ed 100644
Binary files a/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png
index 1581c7ca5..c3b3c5866 100644
Binary files a/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png
index 5d03558c5..3bfd91d8e 100644
Binary files a/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png
index c4d55365d..a881c32ac 100644
Binary files a/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_birthday.png b/Habitica/res/drawable-xxhdpi/icon_birthday.png
index e03d2b3ca..f26d5e0cb 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_birthday.png and b/Habitica/res/drawable-xxhdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_boss_health.png b/Habitica/res/drawable-xxhdpi/icon_boss_health.png
index 54f7c4919..b6e0bf9db 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_boss_health.png and b/Habitica/res/drawable-xxhdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_boss_rage.png b/Habitica/res/drawable-xxhdpi/icon_boss_rage.png
index cdc741ab2..259cc4024 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_boss_rage.png and b/Habitica/res/drawable-xxhdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_eggs.png b/Habitica/res/drawable-xxhdpi/icon_eggs.png
index 15a83f6df..f590b6cd2 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_eggs.png and b/Habitica/res/drawable-xxhdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_food.png b/Habitica/res/drawable-xxhdpi/icon_food.png
index 1100d90c0..3fc7a2977 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_food.png and b/Habitica/res/drawable-xxhdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png b/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png
index f0527ce5b..315bd82e0 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_lock.png b/Habitica/res/drawable-xxhdpi/icon_lock.png
index 7a694af4b..6b0ea9420 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_lock.png and b/Habitica/res/drawable-xxhdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_quests.png b/Habitica/res/drawable-xxhdpi/icon_quests.png
index a17600b05..a713864dc 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_quests.png and b/Habitica/res/drawable-xxhdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_shops.png b/Habitica/res/drawable-xxhdpi/icon_shops.png
index e51098343..e85600161 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_shops.png and b/Habitica/res/drawable-xxhdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_special.png b/Habitica/res/drawable-xxhdpi/icon_special.png
index 5802414e6..19cacf108 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_special.png and b/Habitica/res/drawable-xxhdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-xxhdpi/indicator_subscribe.png b/Habitica/res/drawable-xxhdpi/indicator_subscribe.png
index cb4d663b6..d817304b6 100644
Binary files a/Habitica/res/drawable-xxhdpi/indicator_subscribe.png and b/Habitica/res/drawable-xxhdpi/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/limited.png b/Habitica/res/drawable-xxhdpi/limited.png
index 408a9abae..5f6e16a18 100644
Binary files a/Habitica/res/drawable-xxhdpi/limited.png and b/Habitica/res/drawable-xxhdpi/limited.png differ
diff --git a/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png b/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png
index 3a058a6f8..a310e9f0f 100644
Binary files a/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png and b/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-xxhdpi/no_background.png b/Habitica/res/drawable-xxhdpi/no_background.png
index 6ca2077d4..b4f4aa192 100644
Binary files a/Habitica/res/drawable-xxhdpi/no_background.png and b/Habitica/res/drawable-xxhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/npc_gradient.png b/Habitica/res/drawable-xxhdpi/npc_gradient.png
index eb89f7b9b..91e493d68 100644
Binary files a/Habitica/res/drawable-xxhdpi/npc_gradient.png and b/Habitica/res/drawable-xxhdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-xxhdpi/onboarding_done_art.png b/Habitica/res/drawable-xxhdpi/onboarding_done_art.png
index d9cc8ec0b..298ce31b3 100644
Binary files a/Habitica/res/drawable-xxhdpi/onboarding_done_art.png and b/Habitica/res/drawable-xxhdpi/onboarding_done_art.png differ
diff --git a/Habitica/res/drawable-xxhdpi/party_invite_reject.png b/Habitica/res/drawable-xxhdpi/party_invite_reject.png
index c351769ae..e0606bca2 100644
Binary files a/Habitica/res/drawable-xxhdpi/party_invite_reject.png and b/Habitica/res/drawable-xxhdpi/party_invite_reject.png differ
diff --git a/Habitica/res/drawable-xxhdpi/payment_gift.png b/Habitica/res/drawable-xxhdpi/payment_gift.png
index d2fb03a2b..a81af8ee2 100644
Binary files a/Habitica/res/drawable-xxhdpi/payment_gift.png and b/Habitica/res/drawable-xxhdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-xxhdpi/payment_google.png b/Habitica/res/drawable-xxhdpi/payment_google.png
index 5589b141e..3780cb794 100644
Binary files a/Habitica/res/drawable-xxhdpi/payment_google.png and b/Habitica/res/drawable-xxhdpi/payment_google.png differ
diff --git a/Habitica/res/drawable-xxhdpi/payment_stripe.png b/Habitica/res/drawable-xxhdpi/payment_stripe.png
index 030c1dacf..3319a2b49 100644
Binary files a/Habitica/res/drawable-xxhdpi/payment_stripe.png and b/Habitica/res/drawable-xxhdpi/payment_stripe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/pet_checkmark.png b/Habitica/res/drawable-xxhdpi/pet_checkmark.png
index ead809425..f20881199 100644
Binary files a/Habitica/res/drawable-xxhdpi/pet_checkmark.png and b/Habitica/res/drawable-xxhdpi/pet_checkmark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/separator_fancy.png b/Habitica/res/drawable-xxhdpi/separator_fancy.png
index 7b4687ee8..5115bcd6e 100644
Binary files a/Habitica/res/drawable-xxhdpi/separator_fancy.png and b/Habitica/res/drawable-xxhdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png b/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png
index ed6378d1d..eaeeeb8da 100644
Binary files a/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png and b/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sparkles_left.png b/Habitica/res/drawable-xxhdpi/sparkles_left.png
index 9885b9ec4..db84f84a2 100644
Binary files a/Habitica/res/drawable-xxhdpi/sparkles_left.png and b/Habitica/res/drawable-xxhdpi/sparkles_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png
index 701b30ff9..9737275e4 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_21.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png
index 6704caf80..8f875e800 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_4.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png
index 815b74f08..ecc795f5d 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_42.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png
index ab73f510c..97eac988c 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_84.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png
index 426b1aa9f..e84fd8bba 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png and b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png
index 6b3b23f1d..b01369bc1 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png and b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/star.png b/Habitica/res/drawable-xxhdpi/star.png
index 44da3b86f..1ba7d46aa 100644
Binary files a/Habitica/res/drawable-xxhdpi/star.png and b/Habitica/res/drawable-xxhdpi/star.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png
index b6f271428..8a56eb414 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png b/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png
index f6a97fd09..13e1e2fe4 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png b/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png
index b17dc9503..8f12be290 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png
index 07dac9e0b..3ea287e20 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png b/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png
index b588d14fa..cdaff2b5c 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_plus.png b/Habitica/res/drawable-xxhdpi/sub_plus.png
index 053926a82..29d1aaba7 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_plus.png and b/Habitica/res/drawable-xxhdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscribe_header.png b/Habitica/res/drawable-xxhdpi/subscribe_header.png
index 3fa324fdc..97b346595 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscribe_header.png and b/Habitica/res/drawable-xxhdpi/subscribe_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png
index 3f5f0e1b2..04dec7fe0 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png and b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_header.png b/Habitica/res/drawable-xxhdpi/subscriber_header.png
index baa6a7465..309733378 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscriber_header.png and b/Habitica/res/drawable-xxhdpi/subscriber_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscription_bg.png b/Habitica/res/drawable-xxhdpi/subscription_bg.png
index 152afc073..09669dcda 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscription_bg.png and b/Habitica/res/drawable-xxhdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png
index 9eb1dba33..d47fcef41 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-xxhdpi/survey_art_left.png b/Habitica/res/drawable-xxhdpi/survey_art_left.png
index e68f99f34..f7cc9c604 100644
Binary files a/Habitica/res/drawable-xxhdpi/survey_art_left.png and b/Habitica/res/drawable-xxhdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/survey_art_right.png b/Habitica/res/drawable-xxhdpi/survey_art_right.png
index f5733eea4..ecb647e27 100644
Binary files a/Habitica/res/drawable-xxhdpi/survey_art_right.png and b/Habitica/res/drawable-xxhdpi/survey_art_right.png differ
diff --git a/Habitica/res/drawable/death_ghost.png b/Habitica/res/drawable/death_ghost.png
index bfa6b0130..8adbcb34d 100644
Binary files a/Habitica/res/drawable/death_ghost.png and b/Habitica/res/drawable/death_ghost.png differ
diff --git a/Habitica/res/drawable/party_seeking.png b/Habitica/res/drawable/party_seeking.png
index e025cf329..d640f7857 100644
Binary files a/Habitica/res/drawable/party_seeking.png and b/Habitica/res/drawable/party_seeking.png differ
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 331719381..d84224e3a 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Изпълнявайки целите си в истинския живот, Вие качихте ниво и здравето Ви беше запълнено!</string>
     <string name="onwards">Ура!</string>
     <string name="faint_subtitle">Не се отчайвайте!</string>
-    <string name="faint_penalty_body">Изгубихте ниво, всичкото си злато и един предмет от екипировката си, но можете да си ги върнете с усърдна работа! Късмет — ще се справите.</string>
     <string name="faint_header">Здравето Ви свърши!</string>
     <string name="faint_button">Възстановете здравето си и опитайте отново</string>
     <string name="filter">Филтър</string>
@@ -533,11 +532,11 @@
     <string name="world_boss">Световен главатар</string>
     <string name="boss_art">Графика на главатаря</string>
     <string name="world_boss_description">Описание на световния главатар</string>
-    <string name="rage_strike_count">Яростни удари: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Яростни удари: %d/%d</string>
     <string name="pending_strike_title">Изчакващ удар</string>
     <string name="strike_description_title">Какво е яростен удар?</string>
     <string name="strike_active_title">%s беше нападнат!</string>
-    <string name="strike_active_description">Нашият %s беше съсипан когато %s разби %s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
+    <string name="strike_active_description">Нашият %1$s беше съсипан когато %2$s разби %3$s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
     <string name="questShop">Магазинът за мисии</string>
     <string name="market_owner_long">Алекс Търговеца</string>
     <string name="tavern_owner_long">Даниел Кръчмаря</string>
diff --git a/Habitica/res/values-cs/strings.xml b/Habitica/res/values-cs/strings.xml
index 7a0cb8b23..229c2873a 100755
--- a/Habitica/res/values-cs/strings.xml
+++ b/Habitica/res/values-cs/strings.xml
@@ -62,7 +62,6 @@
     <string name="saturday">Sobota</string>
     <string name="sunday">Neděle</string>
     <string name="faint_subtitle">Nezoufejte!</string>
-    <string name="faint_penalty_body">Ztratil jsi úroveň, zlato a kousek vybavení, ale můžeš je získat zpět když se budeš dost snažit! Hodně štěstí—Ať se ti daří.</string>
     <string name="faint_header">Došlo ti zdraví!</string>
     <string name="faint_button">Doplnit zdraví &amp; a zkusit to znovu</string>
     <string name="filter">Filtr</string>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 43d99206f..e02acfa7e 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Durch das Erfüllen Deiner Lebensziele bist Du ein Level aufgestiegen und bist nun vollständig geheilt!</string>
     <string name="onwards">Vorwärts!</string>
     <string name="faint_subtitle">Nicht verzweifeln!</string>
-    <string name="faint_penalty_body">Du hast ein Level, Dein Gold und ein Teil Deiner Ausrüstung verloren, aber Du kannst mit harter Arbeit alles wieder zurückbekommen! Viel Glück - Du schaffst das.</string>
     <string name="faint_header">Du hast alle Deine Lebenspunkte verloren!</string>
     <string name="faint_button">Lebenspunkte auffüllen &amp; nochmal versuchen</string>
     <string name="filter">Filtern</string>
@@ -533,11 +532,11 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="world_boss">Weltboss</string>
     <string name="boss_art">Boss-Grafik</string>
     <string name="world_boss_description">Weltboss-Beschreibung</string>
-    <string name="rage_strike_count">Raserei-Angriff: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Raserei-Angriff: %d/%d</string>
     <string name="pending_strike_title">Ausstehender Angriff</string>
     <string name="strike_description_title">Was ist ein Raserei-Angriff\?</string>
     <string name="strike_active_title">%s wurde angegriffen!</string>
-    <string name="strike_active_description">%s war am Boden zerstört, als der %s das %s-Gebäude zerschmetterte. Schnell, packt Eure Aufgaben an, um das Monster zu besiegen und beim Wiederaufbau zu helfen!!</string>
+    <string name="strike_active_description">%1$s war am Boden zerstört, als der %2$s das %3$s-Gebäude zerschmetterte. Schnell, packt Eure Aufgaben an, um das Monster zu besiegen und beim Wiederaufbau zu helfen!!</string>
     <string name="questShop">Quest-Shop</string>
     <string name="market_owner_long">Alex der Händler</string>
     <string name="tavern_owner_long">Daniel der Gastwirt</string>
@@ -699,7 +698,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="local">lokale</string>
     <string name="authentication_methods">Authentifizierungsmethoden</string>
     <string name="someone">Jemand</string>
-    <string name="invitation_title">%s hat Dich eingeladen der Gruppe %s beizutreten</string>
+    <string name="invitation_title">%1$s hat Dich eingeladen der Gruppe %2$s beizutreten</string>
     <string name="password_too_short">Das Passwort muss mindestens %d Zeichen haben</string>
     <string name="copy_username">Benutzernamen kopieren</string>
     <string name="id_copied">Benutzer-ID in die Zwischenablage kopiert</string>
@@ -829,8 +828,8 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="task_title">Aufgaben-Titel</string>
     <string name="add_local_authentication">Lokale Authentifizierung hinzufügen</string>
     <string name="defeat">Niederlage</string>
-    <string name="gift_confirmation_text_sub">Du hast %s ein %s-monatiges Abo für Habitica geschickt.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Du hast %s ein %s-monatiges Abo für Habitica geschickt und das gleiche Abo wurde Deinem Konto gutgeschrieben, dank unserer \"Verschenke ein Abo und erhalte eins gratis\"-Aktion!</string>
+    <string name="gift_confirmation_text_sub">Du hast %1$s ein %2$s-monatiges Abo für Habitica geschickt.</string>
+    <string name="gift_confirmation_text_sub_g1g1">Du hast %1$s ein %2$s-monatiges Abo für Habitica geschickt und das gleiche Abo wurde Deinem Konto gutgeschrieben, dank unserer \"Verschenke ein Abo und erhalte eins gratis\"-Aktion!</string>
     <string name="join_party_description_guild">Gib den untenstehenden Benutzernamen einem Freund, oder geh zur %s um potenzielle Verbündete zu treffen!</string>
     <string name="empty_title_rewards_filtered">Keine Belohnungen</string>
     <string name="empty_title_todos_filtered">Keine To-Dos</string>
@@ -1014,11 +1013,11 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="delete_challenge_task_title">Herausforderungsaufgabe löschen\?</string>
     <string name="use_saddle">Magischen Sattel benutzen</string>
     <string name="unhatched_pet">Nicht ausgebrütetes Haustier</string>
-    <string name="can_hatch_pet">Kombiniere Dein %s Ei und %s Elixier, um dieses Haustier auszubrüten!</string>
-    <string name="suggest_pet_hatch_again_missing_both">Du brauchst noch ein %s und %s Elixier, um dieses Haustier erneut auszubrüten</string>
+    <string name="can_hatch_pet">Kombiniere Dein %1$s Ei und %2$s Elixier, um dieses Haustier auszubrüten!</string>
+    <string name="suggest_pet_hatch_again_missing_both">Du brauchst noch ein %1$s und %2$s Elixier, um dieses Haustier erneut auszubrüten</string>
     <string name="suggest_pet_hatch_again_missing_potion">Du brauchst noch ein %s Elixier, um dieses Haustier erneut auszubrüten</string>
     <string name="suggest_pet_hatch_again_missing_egg">Du brauchst noch ein %s Ei, um dieses Haustier erneut auszubrüten</string>
-    <string name="suggest_pet_hatch_missing_both">Du brauchst noch ein %s und %s Elixier, um dieses Haustier auszubrüten</string>
+    <string name="suggest_pet_hatch_missing_both">Du brauchst noch ein %1$s und %2$s Elixier, um dieses Haustier auszubrüten</string>
     <string name="suggest_pet_hatch_missing_potion">Du brauchst noch ein %s Elixier, um dieses Haustier auszubrüten</string>
     <string name="suggest_pet_hatch_missing_egg">Du brauchst noch ein %s Ei, um dieses Haustier auszubrüten</string>
     <string name="hatch_pet_title">Ein neues Haustier ausbrüten</string>
@@ -1036,13 +1035,13 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="block_user_title">%s blockieren\?</string>
     <string name="unblock_user">User entblocken</string>
     <string name="block_user">User blockieren</string>
-    <string name="x_to_y">%s bis %s</string>
+    <string name="x_to_y">%1$s bis %2$s</string>
     <string name="usually_x_gems">Üblicherweise %d Edelsteine</string>
     <string name="limitations">Einschränkungen</string>
     <string name="how_it_works">So funktioniert es</string>
-    <string name="fall_promo_info_instructions">Zwischen %s und %s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
+    <string name="fall_promo_info_instructions">Zwischen %1$s und %2$s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
     <string name="spooky_promo_info_prompt">Der Edelstein-Sonderverkauf ist zurück! Das ist die letzte Chance, mehr Edelsteine als je zuvor zu bekommen, also füll\' Deine Lager solange Du noch kannst!</string>
-    <string name="spooky_promo_info_instructions">Zwischen %s und %s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
+    <string name="spooky_promo_info_instructions">Zwischen %1$s und %2$s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
     <string name="view_gem_bundles">Edelstein-Pakete anzeigen</string>
     <string name="fall_promo_info_prompt">Die Herbstgala ist in vollem Gange. Deshalb haben wir gedacht, dass dies der perfekte Zeitpunkt für den allerersten Edelstein-Sonderverkauf ist! Jetzt bekommst Du mit jedem Einkauf mehr Edelsteine als je zuvor.</string>
     <string name="quest_items_found">Du hast %d Questgegenstände gefunden</string>
@@ -1137,12 +1136,12 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="password_not_matching">Das Passwort muss zweimal richtig eingegeben werden</string>
     <string name="email_invalid">Ungültige E-Mail-Adresse</string>
     <string name="discard">Verwerfen</string>
-    <string name="class_confirmation_price">Möchtest Du Deine Klasse in %s ändern für %d Edelsteine\?</string>
+    <string name="class_confirmation_price">Möchtest Du Deine Klasse in %1$s ändern für %2$d Edelsteine\?</string>
     <string name="use_item">Wende Gegenstand auf Party Mitglied an</string>&gt;
     <string name="unsaved_changes">Ungesicherte Änderungen</string>
     <string name="discard_changes_to_task_message">Bist Du sicher, dass Du die Änderungen an dieser Aufgabe verwerfen möchtest\?</string>
     <string name="gem_purchase_confirmation">Du hast %s Edelsteine erhalten.</string>
-    <string name="gift_confirmation_text_gems_new">Du hast %s %s Edelsteine geschickt.</string>
+    <string name="gift_confirmation_text_gems_new">Du hast %1$s %2$s Edelsteine geschickt.</string>
     <string name="sale_ends_in">Angebot endet in %s</string>
     <string name="my_account">Mein Konto</string>
     <string name="added_social_auth">%s Authentifizierung hinzugefügt</string>
@@ -1204,7 +1203,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="death_description">Aber Du kannst sie alle mit harter Arbeit zurückerlangen! Viel Erfolg - Du wirst das schaffen.</string>
     <string name="faint_broken_equipment">Zerstörte Ausrüstungsgegenstände können 
 \nim Belohnungen-Bereich zurückgekauft werden</string>
-    <string name="faint_loss_description">Du fällst zurück auf Level <b>%d</b>, verlierst <b>%d</b> Gold und <b>ein Ausrüstungsgegenstand</b> wird zerstört…</string>
+    <string name="faint_loss_description">Du fällst zurück auf Level <b>%1$d</b>, verlierst <b>%2$d</b> Gold und <b>ein Ausrüstungsgegenstand</b> wird zerstört…</string>
     <string name="account_reset">Account zurücksetzen</string>
     <string name="avatar_skin_customization">Avatar Haut Anpassung</string>
     <string name="avatar_beard_customization">Avatar Bart Anpassung</string>
@@ -1264,4 +1263,4 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="positive_sentence">positiv</string>
     <string name="title">Titel</string>
     <string name="negative_sentence">negativ</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 7ec97ee8c..3932ca7da 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -417,7 +417,6 @@
     <string name="deleting_account">Deleting Account</string>
     <string name="levelup_header">You Reached Level %1$d!</string>
     <string name="levelup_detail">By accomplishing your real life goals, you levelled up and are now fully healed!</string>
-    <string name="faint_penalty_body">You lost a Level, your Gold, and a piece of Equipment, but you can get them all back with hard work! Good luck—you\'ll do great.</string>
     <string name="reminder_title">Remember to check off your tasks</string>
     <string name="quest_begin_message">Are you sure\? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.</string>
     <string name="ago_1day">1d ago</string>
@@ -539,11 +538,11 @@
     <string name="world_boss">World Boss</string>
     <string name="boss_art">Boss Art</string>
     <string name="world_boss_description">World Boss Description</string>
-    <string name="rage_strike_count">Rage Strikes: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Rage Strikes: %d/%d</string>
     <string name="pending_strike_title">Pending Strike</string>
     <string name="strike_description_title">What\'s a Rage Strike\?</string>
     <string name="strike_active_title">The %s was Attacked!</string>
-    <string name="strike_active_description">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
+    <string name="strike_active_description">Our beloved %1$s was devastated when the %2$s shattered the %3$s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
     <string name="questShop">Quest Shop</string>
     <string name="market_owner_long">Alex the Merchant</string>
     <string name="tavern_owner_long">Daniel the inn keeper</string>
@@ -679,7 +678,7 @@
     <string name="local">local</string>
     <string name="authentication_methods">Authentication Methods</string>
     <string name="someone">Someone</string>
-    <string name="invitation_title">%s invited you to join their group %s</string>
+    <string name="invitation_title">%1$s invited you to join their group %2$s</string>
     <string name="password_too_short">Your password has to be at least %d characters long</string>
     <string name="copy_username">Copy Username</string>
     <string name="id_copied">Copied User ID to clipboard</string>
@@ -831,8 +830,8 @@
     <string name="unlock_previous_short">Finish Quest %d</string>
     <string name="not_participating">You are not participating</string>
     <string name="quest_completed">Quest completed!</string>
-    <string name="gift_confirmation_text_sub">You sent %s a %s-month Habitica subscription.</string>
-    <string name="gift_confirmation_text_sub_g1g1">You sent %s a %s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion!</string>
+    <string name="gift_confirmation_text_sub">You sent %1$s a %2$s-month Habitica subscription.</string>
+    <string name="gift_confirmation_text_sub_g1g1">You sent %1$s a %2$s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion!</string>
     <string name="gift_gems_subtitle">Choose the gem packet you’d like to gift below!</string>
     <string name="join_party_description_guild">Give the username below to a friend or head to the %s to meet potential comrades!</string>
     <string name="insufficientGoldTitle">Not Enough Gold</string>
@@ -981,16 +980,16 @@
     <string name="hatch_pet_again">Hatch Pet again</string>
     <string name="unhatched_pet">Unhatched Pet</string>
     <string name="hatch_pet">Hatch Pet</string>
-    <string name="suggest_pet_hatch_again_missing_both">You need a %s and %s Potion to hatch this pet again</string>
+    <string name="suggest_pet_hatch_again_missing_both">You need a %1$s and %2$s Potion to hatch this pet again</string>
     <string name="suggest_pet_hatch_again_missing_potion">You still need a %s Potion to hatch this pet again</string>
     <string name="suggest_pet_hatch_again_missing_egg">You still need a %s Egg to hatch this pet again</string>
-    <string name="suggest_pet_hatch_missing_both">You need a %s and %s Potion to hatch this pet</string>
+    <string name="suggest_pet_hatch_missing_both">You need a %1$s and %2$s Potion to hatch this pet</string>
     <string name="suggest_pet_hatch_missing_potion">You still need a %s Potion to hatch this pet</string>
     <string name="suggest_pet_hatch_missing_egg">You still need a %s Egg to hatch this pet</string>
     <string name="view_onboarding_tasks">View Onboarding Tasks</string>
     <string name="equip">Equip</string>
     <string name="unequip">Unequip</string>
-    <string name="excessItemsNoneLeft">You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %s3$s\?</string>
+    <string name="excessItemsNoneLeft">You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %3$ss\?</string>
     <string name="purchaseX">Purchase %d</string>
     <string name="excessItemsXLeft">You only need %1$d %2$s to hatch all possible pets. Are you sure you want to purchase %3$d\?</string>
     <string name="excess_items">Excess Items</string>
@@ -1009,7 +1008,7 @@
     <string name="purchasedEquipmentTitle">Purchased Equipment</string>
     <string name="fedPetTitle">Fed a Pet</string>
     <string name="hatchedPetTitle">Hatched a Pet</string>
-    <string name="can_hatch_pet">Combine your %s Egg and %s Potion to hatch this pet!</string>
+    <string name="can_hatch_pet">Combine your %1$s Egg and %2$s Potion to hatch this pet!</string>
     <string name="createdTaskTitle">Created your first task</string>
     <string name="completedTaskTitle">Completed a task</string>
     <string name="purchase_equipment_description">Equipment is a way to customize your avatar and improve your stats</string>
@@ -1031,10 +1030,10 @@
     <string name="block_user_title">Block %s\?</string>
     <string name="unblock_user">Unblock User</string>
     <string name="block_user">Block User</string>
-    <string name="fall_promo_info_instructions">Between September %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="fall_promo_info_instructions">Between September %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="limitations">Limitations</string>
     <string name="how_it_works">How it works</string>
-    <string name="x_to_y">%s to %s</string>
+    <string name="x_to_y">%1$s to %2$s</string>
     <string name="usually_x_gems">Usually %d Gems</string>
     <string name="pms_disabled_description">You can still send messages, but no one can send them to you. You can enable again from Settings.</string>
     <string name="pms_disabled">Private Messages are disabled</string>
@@ -1042,7 +1041,7 @@
     <string name="block">Block</string>
     <string name="block_user_description">A blocked user cannot send you Private Messages but you will still see their posts. This will have no effect if the person is a moderator now or in the future.</string>
     <string name="spooky_promo_info_prompt">The Gem Sale is back to haunt the very end of this year’s Fall Gala! This is one last chance to get more Gems than ever, so stock up while it lasts!</string>
-    <string name="spooky_promo_info_instructions">Between %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="spooky_promo_info_instructions">Between %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="view_gem_bundles">View Gem Bundles</string>
     <string name="fall_promo_info_prompt">The Fall Gala is in full swing so we thought it was the perfect time for a Gem Sale! Now you will get more Gems with each purchase than ever before.</string>
 </resources>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 0fb9730cb..f704f831c 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">¡Cumpliendo tus metas en la vida real, has subido de nivel y tu salud está restaurada!</string>
     <string name="onwards">¡Hurra!</string>
     <string name="faint_subtitle">¡No desesperes!</string>
-    <string name="faint_penalty_body">Has perdido un Nivel, todo tu Oro y una pieza de tu Equipamiento, ¡pero puedes recuperarlo todo con tu esfuerzo! Buena suerte, lo harás genial.</string>
     <string name="faint_header">¡Te has quedado sin puntos de salud!</string>
     <string name="faint_button">Recuperar todos los puntos de salud y volver a intentarlo</string>
     <string name="filter">Filtro</string>
@@ -533,11 +532,11 @@
     <string name="world_boss">Jefe Mundial</string>
     <string name="boss_art">Imagen del jefe</string>
     <string name="world_boss_description">Descripción del Jefe Mundial</string>
-    <string name="rage_strike_count">Ataque de ira: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Ataque de ira: %d/%d</string>
     <string name="pending_strike_title">Ataque pendiente</string>
     <string name="strike_description_title">¿Qué es un Ataque de Ira?</string>
     <string name="strike_active_title">¡El %s ha sido atacado!</string>
-    <string name="strike_active_description">Nuestro querido %s fue destrozado cuando el %s desmenuzó el %s. ¡¡Rápido, enfréntate a tus tareas para derrotar al monstruo y ayudar con la reconstrucción!!</string>
+    <string name="strike_active_description">Nuestro querido %1$s fue destrozado cuando el %2$s desmenuzó el %3$s. ¡¡Rápido, enfréntate a tus tareas para derrotar al monstruo y ayudar con la reconstrucción!!</string>
     <string name="questShop">Tienda de Misiones</string>
     <string name="market_owner_long">Alex el Mercader</string>
     <string name="tavern_owner_long">Daniel el posadero</string>
@@ -684,7 +683,7 @@
     <string name="facebook">Facebook</string>
     <string name="authentication_methods">Métodos de autentificación</string>
     <string name="someone">Alguien</string>
-    <string name="invitation_title">%s te invitó a unirte a su grupo %s</string>
+    <string name="invitation_title">%1$s te invitó a unirte a su grupo %2$s</string>
     <string name="copy_username">Copiar nombre de usuario</string>
     <string name="id_copied">Copiar ID de usuario al portapapeles</string>
     <string name="copy_userid">Copiar ID de usuario</string>
@@ -804,7 +803,7 @@
     <string name="gift_confirmation_text_sub_g1g1">Regalaste a %1$s una suscripción de %2$s meses y se ha aplicado la misma suscripción a tu cuenta por nuestra promoción de Regala Una Llévate Una Gratis.</string>
     <string name="join_party_description_guild">¡Da el nombre de usuario de abajo a un amigo o ve al %s para conocer a camaradas potenciales!</string>
     <string name="number_responded">%1$d/%2$d respondió</string>
-    <string name="fall_promo_info_instructions">Entre el %s y el %s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más Gemas para gastar, compartir o ahorrar para cualquier evento futuro!</string>
+    <string name="fall_promo_info_instructions">Entre el %1$s y el %2$s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más Gemas para gastar, compartir o ahorrar para cualquier evento futuro!</string>
     <string name="spooky_promo_info_prompt">¡La Venta de Gemas está de vuelta para atormentar el final de la Gala de Otoño de este año! Esta es la última oportunidad de conseguir más Gemas que nunca ¡así que aprovecha mientras dure!</string>
     <string name="preference_email_onboarding">Orientación para establecer tu cuenta de Habitica</string>
     <string name="game_mechanics">Mecánicas del Juego</string>
@@ -818,7 +817,7 @@
     <string name="experience_points">Puntos de Experiencia</string>
     <string name="purchaseX">Comprar %d</string>
     <string name="excessItemsXLeft">Solo necesitas %1$d %2$s para eclosionar todas las mascotas posibles. ¿Estás seguro de que quieres comprar %3$d\?</string>
-    <string name="spooky_promo_info_instructions">Entre el %s y el %s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más gemas para gastar, compartir o guardar para cualquier evento futuro!</string>
+    <string name="spooky_promo_info_instructions">Entre el %1$s y el %2$s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más gemas para gastar, compartir o guardar para cualquier evento futuro!</string>
     <string name="view_gem_bundles">Ver paquetes de Gemas</string>
     <string name="fall_promo_info_prompt">La Gala de Otoño está en pleno apogeo, así que pensamos que era el momento perfecto para presentar nuestra primera Venta de Gemas! Ahora obtendrás más gemas con cada compra como nunca antes.</string>
     <string name="defeat">Derrota</string>
@@ -1121,7 +1120,7 @@
     <string name="discard_changes_to_task_message">¿Está seguro de descartar los cambios de esta tarea\?</string>
     <string name="subscription_confirmation">Ahora estás suscrito por 1 mes</string>
     <string name="discard">Descartar</string>
-    <string name="class_confirmation_price">¿Quieres cambiar tu clase a %s por %d Gemas\?</string>
+    <string name="class_confirmation_price">¿Quieres cambiar tu clase a %1$s por %2$d Gemas\?</string>
     <string name="use_item">Usa el objeto en un miebro del grupo</string>&gt;
     <string name="unsaved_changes">Cambios sin guardar</string>
     <string name="gift_confirmation_text_gems_new">Has enviado %2$s gemas a @%1$s.</string>
@@ -1365,4 +1364,4 @@
     <string name="time_management">Manejo de Tiempo + Responsabilidad</string>
     <string name="getting_organized">Organizándose</string>
     <string name="assigned_to_you_by">Se te fue asignado por @%1$s en %2$s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index e3fa6dc6c..eb469179f 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -68,7 +68,6 @@
     <string name="levelup_header">Vous avez atteint le niveau %1$d !</string>
     <string name="levelup_detail">En atteignant vos buts dans la vie réelle, vous avez gagné un niveau et vous êtes maintenant complètement guéri !</string>
     <string name="faint_subtitle">Ne désespérez pas !</string>
-    <string name="faint_penalty_body">Vous avez perdu un niveau, votre or, et une pièce d\'équipement, mais vous pouvez tous les récupérer en travaillant dur ! Bonne chance — vous y arriverez.</string>
     <string name="faint_header">Votre santé est à zéro !</string>
     <string name="faint_button">Reprendre des forces &amp; réessayer</string>
     <string name="filter">Filtrer</string>
@@ -535,11 +534,11 @@
     <string name="world_boss">Boss mondial</string>
     <string name="boss_art">Représentation du boss</string>
     <string name="world_boss_description">Description du boss mondial</string>
-    <string name="rage_strike_count">Attaques de rage : %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Attaques de rage : %d/%d</string>
     <string name="pending_strike_title">Attaque en cours</string>
     <string name="strike_description_title">Qu\'est-ce qu\'une attaque de rage ?</string>
     <string name="strike_active_title">%s a été attaqué !</string>
-    <string name="strike_active_description">Notre %s a eu le cœur brisé lorsque %s a fracassé %s. Vite, réalisez vos quotidiennes pour vaincre le monstre et aider à reconstruire Habitica ! !</string>
+    <string name="strike_active_description">Notre %1$s a eu le cœur brisé lorsque %2$s a fracassé %3$s. Vite, réalisez vos quotidiennes pour vaincre le monstre et aider à reconstruire Habitica ! !</string>
     <string name="questShop">Magasin de quêtes</string>
     <string name="market_owner_long">Alex le marchand</string>
     <string name="tavern_owner_long">Daniel l\'aubergiste</string>
@@ -795,8 +794,8 @@
     <string name="promo_subscription_buy_gems_description">Abonnez-vous pour acheter des gemmes avec de l\'or, obtenir des objets mystères tous les mois, augmenter le taux de butin et plus encore !</string>
     <string name="promo_subscription_buy_gems_prompt">Besoin de gemmes \?</string>
     <string name="transfer_ownership_confirm_message">Cela fera de %s le nouveau responsable de l\'équipe</string>
-    <string name="gift_confirmation_text_sub">Vous avez envoyé à %s un abonnement de %s mois.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Vous avez envoyé à %s un abonnement de %s mois et le même abonnement vous a été accordé pour notre promotion Un en cadeau, un reçu !</string>
+    <string name="gift_confirmation_text_sub">Vous avez envoyé à %1$s un abonnement de %2$s mois.</string>
+    <string name="gift_confirmation_text_sub_g1g1">Vous avez envoyé à %1$s un abonnement de %2$s mois et le même abonnement vous a été accordé pour notre promotion Un en cadeau, un reçu !</string>
     <string name="gift_gems_subtitle">Choisissez le paquet de gemmes que vous voudriez offrir ci-dessous !</string>
     <string name="empty_title_rewards_filtered">Pas de récompense</string>
     <string name="empty_description_todos_filtered">Il n\'y a pas de tâche visible avec vos filtres actuels.</string>
@@ -868,7 +867,7 @@
     <string name="local">local</string>
     <string name="authentication_methods">Méthodes d\'authentification</string>
     <string name="someone">Quelqu\'un</string>
-    <string name="invitation_title">%s vous a invité à rejoindre son groupe %s</string>
+    <string name="invitation_title">%1$s vous a invité à rejoindre son groupe %2$s</string>
     <string name="password_too_short">Votre mot de passe doit contenir au moins %d caractères</string>
     <string name="copy_username">Copier l\'identifiant</string>
     <string name="subscriber_currency">Monnaie d\'abonnement</string>
@@ -981,11 +980,11 @@
     <string name="hatch_pet_again">Faire éclore le familier à nouveau</string>
     <string name="unhatched_pet">Familier non éclos</string>
     <string name="hatch_pet">Faire éclore le familier</string>
-    <string name="can_hatch_pet">Combinez votre œuf de %s et votre potion %s pour faire éclore ce familier !</string>
-    <string name="suggest_pet_hatch_again_missing_both">Vous avez besoin d\'un %s et d\'une potion %s pour faire éclore ce familier à nouveau</string>
+    <string name="can_hatch_pet">Combinez votre œuf de %1$s et votre potion %2$s pour faire éclore ce familier !</string>
+    <string name="suggest_pet_hatch_again_missing_both">Vous avez besoin d\'un %1$s et d\'une potion %2$s pour faire éclore ce familier à nouveau</string>
     <string name="suggest_pet_hatch_again_missing_potion">Vous avez besoin d\'une potion %s pour faire éclore ce familier à nouveau</string>
     <string name="suggest_pet_hatch_again_missing_egg">Vous avez besoin d\'un œuf de %s pour faire éclore ce familier à nouveau</string>
-    <string name="suggest_pet_hatch_missing_both">Vous avez besoin d\'un %s et d\'une potion %s pour faire éclore ce familier</string>
+    <string name="suggest_pet_hatch_missing_both">Vous avez besoin d\'un %1$s et d\'une potion %2$s pour faire éclore ce familier</string>
     <string name="suggest_pet_hatch_missing_potion">Vous avez besoin d\'une potion %s pour faire éclore ce familier</string>
     <string name="suggest_pet_hatch_missing_egg">Vous avez besoin d\'un œuf de %s pour faire éclore ce familier</string>
     <string name="view_onboarding_tasks">Voir les tâches d’intégration</string>
@@ -1037,12 +1036,12 @@
     <string name="block_user">Bloquer l\'utilisateur</string>
     <string name="limitations">Limitations</string>
     <string name="spooky_promo_info_prompt">La vente de gemmes est de retour pour hanter cette fin de gala d\'automne ! C\'est votre dernière chance d\'obtenir plus de gemmes que jamais, alors faites le plein tant que ça dure !</string>
-    <string name="spooky_promo_info_instructions">Entre le %s et le %s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
+    <string name="spooky_promo_info_instructions">Entre le %1$s et le %2$s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
     <string name="view_gem_bundles">Voir les paquets de gemmes</string>
     <string name="fall_promo_info_prompt">Le gala d\'automne bat son plein, alors nous avons pensé que ce serait le moment idéal pour proposer notre toute première vente de gemmes ! Dès à présent, vous recevrez plus de gemmes qu\'auparavant pour chaque achat.</string>
-    <string name="fall_promo_info_instructions">Entre le %s et le %s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
+    <string name="fall_promo_info_instructions">Entre le %1$s et le %2$s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
     <string name="how_it_works">Comment ça marche</string>
-    <string name="x_to_y">%s à %s</string>
+    <string name="x_to_y">%1$s à %2$s</string>
     <string name="usually_x_gems">Généralement %d gemmes</string>
     <string name="quest_leave_message_nostart">Êtes-vous sûr de vouloir quitter la quête \? Vous ne pourrez pas participer.</string>
     <string name="quest_leave_message">Êtes-vous sûr que vous voulez partir de la Quête \? Tout votre progrès sera perdu.</string>
@@ -1151,10 +1150,10 @@
     <string name="minimal">Minimal</string>
     <string name="task_list_mode">Mode liste de tâches</string>
     <string name="discard">Abandonner</string>
-    <string name="class_confirmation_price">Voulez-vous changer de classe et devenir %s pour %d Gemmes \?</string>
+    <string name="class_confirmation_price">Voulez-vous changer de classe et devenir %1$s pour %2$d Gemmes \?</string>
     <string name="use_item">Utilisez l\'objet sur un allié</string>&gt;
     <string name="discard_changes_to_task_message">Voulez-vous vraiment abandonner les changements pour cette tâche \?</string>
-    <string name="gift_confirmation_text_gems_new">Vous avez envoyé %s gemmes à %s.</string>
+    <string name="gift_confirmation_text_gems_new">Vous avez envoyé %2$s gemmes à %1$s.</string>
     <string name="subscription_confirmation_multiple">Vous disposez maintenant de %s mois d\'abonnement</string>
     <string name="my_account">Mon compte</string>
     <string name="quest_party_required_description">Quand vous faites partie d\'une équipe, vous pouvez faire des quêtes en solo ou inviter des amis pour quêter avec eux !</string>
@@ -1210,7 +1209,7 @@
     <string name="tutorial_reset_confirmation">Vos tutoriels ont été réinitialisés</string>
     <string name="you_ran_out_of_health">Vous avez épuisé votre santé !</string>
     <string name="death_description">Mais vous pouvez tous les récupérer avec un peu de travail ! Bonne chance — vous allez y arriver.</string>
-    <string name="faint_loss_description">Vous redescendrez au niveau <b>%d</b>, perdrez <b>%d</b> pièces d\'or, et abîmerez <b>une pièce d\'équipement</b>…</string>
+    <string name="faint_loss_description">Vous redescendrez au niveau <b>%1$d</b>, perdrez <b>%2$d</b> pièces d\'or, et abîmerez <b>une pièce d\'équipement</b>…</string>
     <string name="account_reset">Réinitialisation du compte</string>
     <string name="avatar_skin_customization">Personnalisation de l\'apparence de l\'avatar</string>
     <string name="avatar_shirt_customization">Personnalisation de l\'habit de l\'avatar</string>
@@ -1311,4 +1310,4 @@
     <string name="promote_to_manager">Promouvoir à Gestionnaire</string>
     <string name="task_summary">Sommaire des Tâches</string>
     <string name="mute_user">Rendre muet le Joueur</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 745563833..482a4b612 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Postižući svoje ciljeve u stvarnom životu, podigao/la si svoj level i sad si u potpunosti iscijeljen/a!</string>
     <string name="onwards">Hura!</string>
     <string name="faint_subtitle">Ne očajavaj!</string>
-    <string name="faint_penalty_body">Izgubio/la si level, svoje Zlatnike i komad opreme, ali ih možeš vratiti marljivim radom! Sretno - ići će te sjajno.</string>
     <string name="faint_header">Ostao/la si bez Zdravlja!</string>
     <string name="faint_button">Obnovi Zdravlje &amp; Pokušaj ponovno</string>
     <string name="filter">Filtriraj</string>
@@ -524,11 +523,11 @@
     <string name="world_boss">Svjetski Bos</string>
     <string name="boss_art">Umjetnički prikazi Bosa</string>
     <string name="world_boss_description">Opis Svjetskog Bosa</string>
-    <string name="rage_strike_count">Udari Bijesa: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Udari Bijesa: %d/%d</string>
     <string name="pending_strike_title">U iščekivanju Udarca</string>
     <string name="strike_description_title">Što je Udar Bijesa?</string>
     <string name="strike_active_title">%s je bio napadnut!</string>
-    <string name="strike_active_description">Naš dragi %s je bio razoren kad je %s razbio %s. Brzo, navali na svoje zadatke kako bi porazio/la čudovište i pomogao/la u obnovi!!</string>
+    <string name="strike_active_description">Naš dragi %1$s je bio razoren kad je %2$s razbio %3$s. Brzo, navali na svoje zadatke kako bi porazio/la čudovište i pomogao/la u obnovi!!</string>
     <string name="questShop">Dućan pustolovina</string>
     <string name="market_owner_long">Alex Trgovac</string>
     <string name="tavern_owner_long">Danijel Gostioničar</string>
@@ -642,7 +641,7 @@
     <string name="ago_1month">Prije 1 mjeseca</string>
     <string name="remaining_1Minute">Još 1 minuta</string>
     <string name="opting_out_progress">Odustajanje</string>
-    <string name="class_confirmation_price">Želiš li promijeniti svoju klasu u %s za %d Dragulja\?</string>
+    <string name="class_confirmation_price">Želiš li promijeniti svoju klasu u %1$s za %2$d Dragulja\?</string>
     <string name="leave_challenges">Napusti izazove</string>
     <string name="inviteFriendTitle">Pozvan je prijatelj</string>
     <string name="inviteFriendDescription">Pozvao/la si prijatelja (ili prijatelje) koji su ti se pridružili u avanturi!</string>
@@ -865,7 +864,7 @@
     <string name="gift_gems_balance_subtitle">Upiši koliko svojih Dragulja želiš poslati ispod ili promijeni karticu da kupiš Dragulje za poklon</string>
     <string name="password_too_short">Tvoja zaporka treba biti dugačka barem %d znakova</string>
     <string name="preference_push_joined_guild_mention">\@Spomeni u pridruženim Cehovima</string>
-    <string name="invitation_title">%s te pozvao da se pridružiš njihovoj grupi %s</string>
+    <string name="invitation_title">%1$s te pozvao da se pridružiš njihovoj grupi %2$s</string>
     <string name="someone">Netko</string>
     <string name="authentication_methods">Metode provjere autentičnosti</string>
     <string name="local">lokalno</string>
@@ -1057,7 +1056,7 @@
     <string name="pms_disabled_description">Još uvijek možeš slati poruke, ali nitko ih ne može slati tebi. Možeš ih ponovo omogućiti u Postavkama.</string>
     <string name="view_gem_bundles">Pogledaj Pakete Dragulja</string>
     <string name="usually_x_gems">Obično %d Dragulja</string>
-    <string name="spooky_promo_info_instructions">Između %s i %s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
+    <string name="spooky_promo_info_instructions">Između %1$s i %2$s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
     <string name="x_to_y">%1$s do %2$s</string>
     <string name="dark_mode">Tamni Način Rada</string>
     <string name="submit_feedback">Pošalji povratne informacije</string>
@@ -1105,7 +1104,7 @@
     <string name="apitoken_summary">Kopiraj Token. Pažljivo, ovo je zaporka!</string>
     <string name="mount_category">%s Jahače Životinje</string>
     <string name="disablePrivateMessages">Onemogući Privatne Poruke</string>
-    <string name="fall_promo_info_instructions">Između %s i %s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
+    <string name="fall_promo_info_instructions">Između %1$s i %2$s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
     <string name="open_website">Otvori Web Stranicu</string>
     <string name="delete_challenge_task_description">Ovo je jedan od %1$d zadataka koji su dio “%2$s” Izazova. Moraš napustiti Izazov kako bi izbrisao/la ovaj zadatak.</string>
     <string name="no_longer_available">Više nije dostupno</string>
@@ -1274,7 +1273,7 @@
     <string name="fall_promo_info_prompt">Jesenska gala zabava je u punom jeku pa smo mislili da je savršeno vrijeme za Rasprodaju Dragulja! Sada ćeš svakom kupnjom dobiti više Dragulja nego ikada prije.</string>
     <string name="clear_cache_description">Za brisanje predmemorije, otvori aplikaciju Postavke na telefonu. Idi na Pohrana &gt; Aplikacije &gt; Habitica, zatim dodirnite Očisti Predmemoriju.</string>
     <string name="death_description">Ali možeš ih sve vratiti uz naporan rad! Sretno - bit ćeš super.</string>
-    <string name="faint_loss_description">Past ćeš na razinu <b>%d</b>, izgubiti <b>%d</b> Zlatnika i razbiti <b>komad opreme</b>…</string>
+    <string name="faint_loss_description">Past ćeš na razinu <b>%1$d</b>, izgubiti <b>%2$d</b> Zlatnika i razbiti <b>komad opreme</b>…</string>
     <string name="health_fitness">Zdravlje + Fitnes</string>
     <string name="time_management">Upravljanje vremenom + Odgovornost</string>
     <string name="habit_summary_description">Ovo je **%1$s** Navika koja je **%2$s**.</string>
diff --git a/Habitica/res/values-hu/strings.xml b/Habitica/res/values-hu/strings.xml
index b7dd5e25f..3c9260f21 100755
--- a/Habitica/res/values-hu/strings.xml
+++ b/Habitica/res/values-hu/strings.xml
@@ -64,7 +64,6 @@
     <string name="levelup_header">Elérted a %1$d. szintet!</string>
     <string name="levelup_detail">A valós céljaid elvégzésével szintet léptél, és teljesen felgyógyultál!</string>
     <string name="faint_subtitle">Ne ess kétségbe!</string>
-    <string name="faint_penalty_body">Elvesztettél egy szintet, az aranyad és egy darab felszerelési tárgyat, de mindet visszaszerezheted kemény munkával! Sok sikert, menni fog!</string>
     <string name="faint_header">Elfogyott az életerőd!</string>
     <string name="faint_button">Töltsd fel az életerődet és próbáld újra</string>
     <string name="filter">Szűrő</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 95448122f..94a1ca375 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -503,11 +503,11 @@
     <string name="world_boss">Bos Dunia</string>
     <string name="boss_art">Seni Bos</string>
     <string name="world_boss_description">Deskripsi Bos Dunia</string>
-    <string name="rage_strike_count">Tingkat Kemarahan 1%d/1%d</string>
+    <string name="rage_strike_count" formatted="false">Tingkat Kemarahan %1$d/%2$d</string>
     <string name="pending_strike_title">Serangan Tertunda</string>
     <string name="strike_description_title">Apakah itu Tingkatan Kemarahan?</string>
     <string name="strike_active_title">Sang %s telah Diserang!</string>
-    <string name="strike_active_description">%s kita yang tercinta hancur sewaktu sang %s meremukkan %s. Cepat, kalahkan tugas-tugasmu untuk mengalahkan sang monster dan bantu membangun kembali!!</string>
+    <string name="strike_active_description">%1$s kita yang tercinta hancur sewaktu sang %2$s meremukkan %3$s. Cepat, kalahkan tugas-tugasmu untuk mengalahkan sang monster dan bantu membangun kembali!!</string>
     <string name="questShop">Toko Misi</string>
     <string name="market_owner_long">Alex sang Pedagang</string>
     <string name="tavern_owner_long">Daniel sang penjaga penginapan</string>
@@ -520,7 +520,6 @@
     <string name="insufficientSubscriberGems">Kamu telah membeli semua Permata yang tersedia bulan ini. Lebih banyak akan ditambahkan dalam tiga hari pertama pada setiap bulan. Terima kasih sudah berlangganan!</string>
     <string name="levelup_header">Kamu Telah Mencapai Level %1$d!</string>
     <string name="levelup_detail">Dengan menyelesaikan tujuan hidupmu, kamu naik level dan sekarang sepenuhnya pulih!</string>
-    <string name="faint_penalty_body">Kamu kehilangan satu level, uangmu, and sebagian perlengkapan, tapi kamu bisa mendapatkannya kembali dengan kerja keras! Semoga beruntung—kamu bisa melakukannya dengan baik.</string>
     <string name="reminder_title">Ingatlah untuk selalu memeriksa tugas anda</string>
     <string name="ago_1day">1 hari yang lalu</string>
     <string name="ago_days">%d hari yang lalu</string>
@@ -701,8 +700,8 @@
     <string name="confirm_deletion">Konfirmasi penghapusan</string>
     <string name="leave_guild_challenges_confirmation">Apakah kamu ingin tetap berpartisipasi dalam Tantangan saat meninggalkan Perkumpulan\?</string>
     <string name="leave_guild_confirmation">Apakah kamu yakin ingin keluar dari perkumpulan ini\?</string>
-    <string name="gift_confirmation_text_sub">Kamu mengirimkan %s berlangganan %s-bulan Habitica.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Kamu mengirimkan %s sebuah berlangganan %s-bulan dan berlangganan yang sama telah diterapkan pada akunmu melalui promo kami Beri Satu Dapat Satu!</string>
+    <string name="gift_confirmation_text_sub">Kamu mengirimkan %1$s berlangganan %2$s-bulan Habitica.</string>
+    <string name="gift_confirmation_text_sub_g1g1">Kamu mengirimkan %1$s sebuah berlangganan %2$s-bulan dan berlangganan yang sama telah diterapkan pada akunmu melalui promo kami Beri Satu Dapat Satu!</string>
     <string name="update_available">Update tersedia: %1$s (%2$d)</string>
     <string name="streak">Beruntutan</string>
     <string name="new_reminder">Pengingat baru</string>
@@ -878,7 +877,7 @@
     <string name="local">lokal</string>
     <string name="authentication_methods">Metode Otentikasi</string>
     <string name="someone">Seseorang</string>
-    <string name="invitation_title">%s mengundangmu untuk bergabung dengan grup %s</string>
+    <string name="invitation_title">%1$s mengundangmu untuk bergabung dengan grup %2$s</string>
     <string name="password_too_short">Kata sandimu harus setidaknya %d karakter</string>
     <string name="copy_username">Salin Nama Pengguna</string>
     <string name="id_copied">Salin ID Pengguna ke clipboard</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index d895efc72..720570da8 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Raggiungendo obiettivi nella vita reale, sei salito di livello e la tua Salute è stata ripristinata!</string>
     <string name="onwards">Urrà!</string>
     <string name="faint_subtitle">Non disperarti!</string>
-    <string name="faint_penalty_body">Hai perso un livello, l\'oro e un pezzo di equipaggiamento, ma puoi riottenere ogni cosa lavorando sodo! Buona fortuna, vedrai che ci riuscirai.</string>
     <string name="faint_header">Hai finito i punti salute!</string>
     <string name="faint_button">Ripristina i punti salute &amp; Riprova</string>
     <string name="filter">Filtro</string>
@@ -871,7 +870,7 @@
     <string name="local">locale</string>
     <string name="authentication_methods">Metodi di autenticazione</string>
     <string name="someone">Qualcuno</string>
-    <string name="invitation_title">%s ti ha invitato ad unirti al suo gruppo %s</string>
+    <string name="invitation_title">%1$s ti ha invitato ad unirti al suo gruppo %2$s</string>
     <string name="password_too_short">La tua password deve essere lunga almeno %d caratteri</string>
     <string name="copy_username">Copia Nome Utente</string>
     <string name="id_copied">ID Utente copiato negli appunti</string>
@@ -946,8 +945,8 @@
     <string name="switch_to_list_view">Passa alla vista elenco</string>
     <string name="delete_reminder">Elimina Promemoria</string>
     <string name="leave_guild_confirmation">Sei sicuro di voler abbandonare questa gilda\?</string>
-    <string name="gift_confirmation_text_sub">Hai inviato a %s un abbonamento Habitica per %s mesi.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Hai inviato a %s un abbonamento Habitica per %s mesi e lo stesso abbonamento è stato aggiunto al tuo account per la nostra promozione Regalane uno Prendine Uno!</string>
+    <string name="gift_confirmation_text_sub">Hai inviato a %1$s un abbonamento Habitica per %2$s mesi.</string>
+    <string name="gift_confirmation_text_sub_g1g1">Hai inviato a %1$s un abbonamento Habitica per %2$s mesi e lo stesso abbonamento è stato aggiunto al tuo account per la nostra promozione Regalane uno Prendine Uno!</string>
     <string name="gift_gems_subtitle">Scegli qui di seguito il pacchetto di gemme che vuoi regalare!</string>
     <string name="number_responded">%1$d/%2$d risposte</string>
     <string name="empty_title_rewards_filtered">Nessuna Ricompensa</string>
@@ -1006,11 +1005,11 @@
     <string name="hatch_pet_again">Schiudi di nuovo un animale</string>
     <string name="unhatched_pet">Animali non schiusi</string>
     <string name="hatch_pet">Schiudi un Animale</string>
-    <string name="can_hatch_pet">Combina il tuo Uovo %s e la tua Pozione %s per schiudere questo animale!</string>
-    <string name="suggest_pet_hatch_again_missing_both">Hai ancora bisogno di %s ed un uovo %s per poter schiudere di nuovo questo animale</string>
+    <string name="can_hatch_pet">Combina il tuo Uovo %1$s e la tua Pozione %2$s per schiudere questo animale!</string>
+    <string name="suggest_pet_hatch_again_missing_both">Hai ancora bisogno di %1$s ed un uovo %2$s per poter schiudere di nuovo questo animale</string>
     <string name="suggest_pet_hatch_again_missing_potion">Hai ancora bisogno di una Pozione %s per poter schiudere di nuovo questo animale</string>
     <string name="suggest_pet_hatch_again_missing_egg">Hai ancora bisogno di un uovo %s per poter schiudere di nuovo questo animale</string>
-    <string name="suggest_pet_hatch_missing_both">Hai bisogno di %s e una Pozione %s per poter schiudere questo animale</string>
+    <string name="suggest_pet_hatch_missing_both">Hai bisogno di %1$s e una Pozione %2$s per poter schiudere questo animale</string>
     <string name="suggest_pet_hatch_missing_potion">Hai bisogno di una Pozione %s per poter schiudere questo animale</string>
     <string name="suggest_pet_hatch_missing_egg">Hai bisogno di un uovo %s per poter schiudere questo animale</string>
     <string name="view_onboarding_tasks">Visualizza le attività introduttive</string>
@@ -1031,13 +1030,13 @@
     <string name="unblock_user">Sblocca utente</string>
     <string name="block_user">Blocca utente</string>
     <string name="spooky_promo_info_prompt">La vendita di Gemme è tornata per infestare la fine del Gala Autunnale di quest\'anno! Questa è l\'ultima possibilità per ottenere più gemme che mai, quindi fanne scorta finché dura!</string>
-    <string name="spooky_promo_info_instructions">Tra il %s e il %s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
+    <string name="spooky_promo_info_instructions">Tra il %1$s e il %2$s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
     <string name="view_gem_bundles">Visualizza pacchetti di gemme</string>
     <string name="fall_promo_info_prompt">Il Gala Autunnale è in pieno svolgimento, quindi abbiamo pensato che fosse il momento perfetto per presentare la nostra prima vendita di Gemme in assoluto! Ora otterrai più gemme ogni acquisto più che mai.</string>
-    <string name="fall_promo_info_instructions">Tra il %s e il %s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
+    <string name="fall_promo_info_instructions">Tra il %1$s e il %2$s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
     <string name="limitations">Limitazioni</string>
     <string name="how_it_works">Come funziona</string>
-    <string name="x_to_y">%s a %s</string>
+    <string name="x_to_y">%1$s a %2$s</string>
     <string name="usually_x_gems">Solitamente %d Gemme</string>
     <string name="user_is_blocked_explanation">Un utente bloccato non può mandarti Messaggi Privati ma vedrai i suoi messaggi nella Taverna o nelle Gilde.</string>
     <string name="user_is_blocked">Hai bloccato questo utente</string>
@@ -1128,7 +1127,7 @@
     <string name="sale_ends_in">La vendita termina fra %s</string>
     <string name="damage_pending">%s danno in sospeso</string>
     <string name="discard">Scarta</string>
-    <string name="class_confirmation_price">Vuoi cambiare la tua classe in %s per %d gemme\?</string>
+    <string name="class_confirmation_price">Vuoi cambiare la tua classe in %1$s per %2$d gemme\?</string>
     <string name="adventure_guide_description_new">Completa questi obbiettivi e guadagnerai &lt;b&gt;5 Medaglie&lt;/b&gt; e &lt;font color=#EE9109&gt;&lt;b&gt;100 Ori&lt;/b&gt;&lt;/font&gt; quando avrai finito!</string>
     <string name="removed_social_auth">%s disconnesso</string>
     <string name="discard_changes_to_task_message">Sei sicuro/a di voler scartare le modifiche fatte a questa attività\?</string>
@@ -1139,7 +1138,7 @@
     <string name="add">Aggiungi</string>
     <string name="use_item">Usa Oggetto sul membro della squadra</string>&gt;
     <string name="unsaved_changes">Modifiche Non Salvate</string>
-    <string name="gift_confirmation_text_gems_new">Hai inviato %s %s gemme.</string>
+    <string name="gift_confirmation_text_gems_new">Hai inviato %1$s %2$s gemme.</string>
     <string name="subscription_confirmation">Sei ora abbonato/a per 1 mese</string>
     <string name="subscription_confirmation_multiple">Sei ora abbonato/a per %s mesi</string>
     <string name="gem_purchase_confirmation">Hai ottenuto %s gemme.</string>
@@ -1212,7 +1211,7 @@
     <string name="tutorial_reset_confirmation">I tuoi Tutorial sono stati resettati</string>
     <string name="death_description">Ma puoi recuperarli tutti lavorando sodo! Buona fortuna, te la caverai benissimo.</string>
     <string name="faint_broken_equipment">L\'equipaggiamento danneggiato può essere ricomprato nella colonna Ricompense</string>
-    <string name="faint_loss_description">Tornerai a livello <b>%d</b>, perderai <b>%d</b> Oro e danneggerai <b>un pezzo di armatura</b>…</string>
+    <string name="faint_loss_description">Tornerai a livello <b>%1$d</b>, perderai <b>%2$d</b> Oro e danneggerai <b>un pezzo di armatura</b>…</string>
     <string name="account_reset">Ripristino Account</string>
     <string name="display">Mostra</string>
     <string name="go_to_subscription">Vai ad abbonamento</string>
@@ -1250,4 +1249,4 @@
         <item quantity="other">Voi, %d altri</item>
     </plurals>
     <string name="x_and_y">%1$s e %2$s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 18d7727c2..bdeaad2b4 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -230,7 +230,6 @@
     <string name="repeatables_frequency_day_of_week">יום בשבוע</string>
     <string name="levelup_header">הגעת לרמה %1$d!</string>
     <string name="levelup_detail">באמצעות השלמה של משימות בחייך האמיתיים, עלית רמה וכל נקודות החיים שלך התמלאו!</string>
-    <string name="faint_penalty_body">הפסדת רמה, את כל הזהב, וחתיכה של ציוד, אבל תשיג את כולם חזרה באמצעות עבודה קשה! בהצלחה-אנחנו בטוחים שתצליח.</string>
     <string name="used_skill_without_mana">השתמשת ב%1$s.</string>
     <string name="reminder_title">לא לשכוח לסמן משימות שהושלמו</string>
     <string name="version_info">גרסה %1$s‏ (%2$d)</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 735dbfb19..7302ae014 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">現実での目標を達成してレベルが上がり、体力が全回復した！</string>
     <string name="onwards">イエーイ!</string>
     <string name="faint_subtitle">がっかりしないで!</string>
-    <string name="faint_penalty_body">レベルとゴールドと、いずれかの装備品を失いました。だけど、がんばればすべてを取り返せます！幸あらんことを。——あなたなら、きっとできます。</string>
     <string name="faint_header">体力がなくなった!</string>
     <string name="faint_button">体力を全回復してやり直す</string>
     <string name="filter">フィルター</string>
@@ -533,11 +532,11 @@
     <string name="world_boss">ワールドボス</string>
     <string name="boss_art">ボス画像</string>
     <string name="world_boss_description">ワールドボスの説明</string>
-    <string name="rage_strike_count">怒り攻撃 %d/%d</string>
+    <string name="rage_strike_count" formatted="false">怒り攻撃 %d/%d</string>
     <string name="pending_strike_title">保留中の攻撃</string>
     <string name="strike_description_title">怒り攻撃とは？</string>
     <string name="strike_active_title">%s が襲撃を受けました！</string>
-    <string name="strike_active_description">愛すべき%sは%sの攻撃で%sが破壊されてしまい途方に暮れています。急いでタスクに取り組んで、あの怪物を倒して再建の手助けをしましょう！</string>
+    <string name="strike_active_description">愛すべき%1$sは%2$sの攻撃で%3$sが破壊されてしまい途方に暮れています。急いでタスクに取り組んで、あの怪物を倒して再建の手助けをしましょう！</string>
     <string name="questShop">クエスト売り場</string>
     <string name="market_owner_long">商人のAlex</string>
     <string name="tavern_owner_long">ロッジの主人Daniel</string>
@@ -852,7 +851,7 @@
     <string name="local">ローカル</string>
     <string name="authentication_methods">認証方式</string>
     <string name="someone">誰か</string>
-    <string name="invitation_title">%sはあなたをグループ%sに招待しました</string>
+    <string name="invitation_title">%1$sはあなたをグループ%2$sに招待しました</string>
     <string name="password_too_short">パスワードが短すぎます。あと%d文字必要です</string>
     <string name="copy_username">ユーザー名をコピーする</string>
     <string name="id_copied">ユーザーIDをクリップボードにコピーする</string>
@@ -1023,10 +1022,10 @@
     <string name="first_drop_title">新しいアイテムを見つけました！</string>
     <string name="go_to_items">「アイテム」へ</string>
     <string name="spooky_promo_info_prompt">ジェムのセールが今年の秋の大祭に出没するために戻ってきました！いつもよりもジェムを多く手に入れるラストチャンスです。キャンペーンの間にジェムをストックしておきましょう！</string>
-    <string name="spooky_promo_info_instructions">%sから%sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
+    <string name="spooky_promo_info_instructions">%1$sから%2$sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
     <string name="view_gem_bundles">ジェムセットを見る</string>
     <string name="fall_promo_info_prompt">秋の大祭も最高潮で、はじめてのジェムのセールを皆さんにお知らせするのに最高のタイミングだと我々は考えました！このセールでは、いつもと同じ値段で、いつもよりも多くのジェムが購入できます。</string>
-    <string name="fall_promo_info_instructions">%sから%sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
+    <string name="fall_promo_info_instructions">%1$sから%2$sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
     <string name="limitations">制限事項</string>
     <string name="how_it_works">機能説明</string>
     <string name="x_to_y">%1$sから%2$sへ</string>
@@ -1122,7 +1121,7 @@
     <string name="reset_counter">カウンターをリセット</string>
     <string name="x_remaining">残り%s</string>
     <string name="discard">捨てる</string>
-    <string name="class_confirmation_price">クラスを%sに%dジェムで変更しますか？</string>
+    <string name="class_confirmation_price">クラスを%1$sに%2$dジェムで変更しますか？</string>
     <string name="use_item">パーティーメンバーにアイテムを使う</string>&gt;
     <string name="unsaved_changes">保存されていない変更</string>
     <string name="discard_changes_to_task_message">このタスクへの変更を保存せずに終了しますか？</string>
@@ -1161,7 +1160,7 @@
     <string name="quest_party_required_title">クエストを開始する前にパーティーに参加する必要があります</string>
     <string name="quest_party_required_description">パーティーに入れば、ひとりでクエストに挑戦したり、仲間を招待して一緒にクエストに挑戦したりできます！</string>
     <string name="new_pieces_added_every_month">毎月新しい作品が追加されます</string>
-    <string name="armoire_rate_equipment_description">毎月、新しい装備品が追加されます。すべての装備品を所持している場合、50%/50%の確率で「食べ物」または「経験値」を獲得できます。</string>
+    <string name="armoire_rate_equipment_description">毎月、新しい装備品が追加されます。すべての装備品を所持している場合、50/50の確率で「食べ物」または「経験値」を獲得できます。</string>
     <string name="armoire_rate_food_description">10種類の食べ物のうち1つを受け取れます。特別なイベント時には、通常の食べ物がケーキやお菓子に変わります。</string>
     <string name="cds_subtitle">デフォルトの0時時間をすぎた時間に1日が切り替わるように調整できます。</string>
     <string name="avatar_hair_color_customization">ヘアカラーのカスタマイズ</string>
@@ -1233,7 +1232,7 @@
 \n買い戻すことができます</string>
     <string name="armoire_rate_experience_title">20% 経験値</string>
     <string name="armoire_rate_food_title">20% の食べ物</string>
-    <string name="faint_loss_description">レベル <b>%d</b> に下がり、<b>%d</b> ゴールドを失い、<b>装備が一つ</b> が壊れます…頑張ればすべて取り戻せます！</string>
+    <string name="faint_loss_description">レベル <b>%1$d</b> に下がり、<b>%2$d</b> ゴールドを失い、<b>装備が一つ</b> が壊れます…頑張ればすべて取り戻せます！</string>
     <string name="armoire_rate_equipment_title">60% 装備品</string>
     <string name="academics">学術分野</string>
     <string name="advocacy_causes">主義主張</string>
@@ -1331,7 +1330,6 @@
     <string name="report_failure">報告に失敗しました、後ほど再実行してください</string>
     <string name="report_player_toolbar_title">%sを報告する</string>
     <string name="gems_promo_info_limitations_fixed">このキャンペーンは季節限定イベントの間のみの実施です。このイベントは%1$s (%2$s)に始まり、%3$s (%4$s)に終了します。キャンペーンの対象は自分へのジェムを購入したときにのみ適用されます。</string>
-    <string name="g1g1_promo_info_limitations_fixed">このイベントは日本時間で%1$s (%2$s)から%3$s (%4$s)までの期間限定です。プロモーションは他のプレイヤーにギフトを贈った際にのみ適用されます。もしギフトを受け取った人がすでに有料会員の場合、有料会員期間が延長されます。この延長は、現在の有料会員期間を満了もしくはキャンセルした後にのみ適用されます。</string>
     <string name="mute_user">プレーヤーをミュートする</string>
     <string name="unban_user_confirm">このプレーヤーの復帰させますか？</string>
     <string name="amazon">Amazon</string>
@@ -1389,4 +1387,4 @@
     <string name="resume_damage_2_description">未完了の日課は、連続実行回数と習慣カウンターを通常通りリセットします</string>
     <string name="you_equipped_x">%sを装備しました</string>
     <string name="open_settings">設定を開く</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 7edc327d3..b208c272d 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -376,7 +376,6 @@
     <string name="leave_party">파티 떠나기</string>
     <string name="levelup_header">레벨 %1$d이 되었습니다!</string>
     <string name="levelup_detail">생활의 목표를 달성함으로 레벨이 올라가서 체력이 완전히 회복되었습니다!</string>
-    <string name="faint_penalty_body">레벨 하나, 골드 전부, 그리고 장비 하나를 잃었네요, 하지만 열심히 일하면 모두 다시 얻을 수 있습니다! 화이팅 - 잘 할 수 있어요.</string>
     <string name="reminder_title">끝낸 과제에 체크하는 걸 잊지 마세요</string>
     <string name="ago_1day">1일 전</string>
     <string name="ago_days">%d일 전</string>
@@ -545,7 +544,7 @@
     <string name="pending_strike_title">임박한 타격</string>
     <string name="strike_description_title">분노의 타격이 무엇인가요\?</string>
     <string name="strike_active_title">%s 이(가) 공격받았습니다!</string>
-    <string name="strike_active_description" formatted="false">우리의 %s는 %s가 %s를 산산조각 내서 엄청난 충격을 받았습니다. 어서 과제를 수행해서 괴물을 물리치고 재건할 수 있게 도와주세요!!</string>
+    <string name="strike_active_description" formatted="false">우리의 %1$s는 %2$s가 %3$s를 산산조각 내서 엄청난 충격을 받았습니다. 어서 과제를 수행해서 괴물을 물리치고 재건할 수 있게 도와주세요!!</string>
     <string name="questShop">퀘스트 상점</string>
     <string name="market_owner_long">상인 알렉스</string>
     <string name="tavern_owner_long">여관 주인 다니엘</string>
@@ -749,8 +748,8 @@
     <string name="subscribe_listitem5">아이템 드롭이 두 배</string>
     <string name="subscribe_listitem3_description_new">지금 %s를 받고 매달 새로운 아이템을 받으려면 구독하세요!</string>
     <string name="leave_guild_confirmation">정말로 길드를 탈퇴하시겠습니까\?</string>
-    <string name="gift_confirmation_text_sub">%s 에게 %s-개월 해비티카 구독권을 선물했습니다.</string>
-    <string name="gift_confirmation_text_sub_g1g1">원 플러스 원 프로모션을 통해 %s 에게 %s-개월 해비티카 구독권을 선물하고 동일한 구독 기간이 본인의 계정에도 적용되었습니다!</string>
+    <string name="gift_confirmation_text_sub">%1$s 에게 %2$s-개월 해비티카 구독권을 선물했습니다.</string>
+    <string name="gift_confirmation_text_sub_g1g1">원 플러스 원 프로모션을 통해 %1$s 에게 %2$s-개월 해비티카 구독권을 선물하고 동일한 구독 기간이 본인의 계정에도 적용되었습니다!</string>
     <string name="gift_gems_subtitle">선물하고 싶은 보석 꾸러미를 선택하세요!</string>
     <string name="number_responded">%1$d/%2$d 수락함</string>
     <string name="empty_title_todos_filtered">할 일 없음</string>
@@ -840,7 +839,7 @@
     <string name="copy_userid">API 아이디 복사하기</string>
     <string name="authentication_methods">인증 방식</string>
     <string name="someone">누군가</string>
-    <string name="invitation_title">%s 님이 %s 그룹에 초대하셨습니다</string>
+    <string name="invitation_title">%1$s 님이 %2$s 그룹에 초대하셨습니다</string>
     <string name="sale">할인</string>
     <string name="promo_g1g1_prompt">원 플러스 원 이벤트</string>
     <string name="promo_g1g1_description">지금 구독을 선물하면 본인도 같은 구독을 무료로 받게 됩니다!</string>
@@ -962,12 +961,12 @@
     <string name="common_questions">자주 묻는 질문</string>
     <string name="usernames_party">%s의 파티</string>
     <string name="discard">버리기</string>
-    <string name="class_confirmation_price">%d개의 보석을 사용하여 %s직업으로 전직하시겠습니까\?</string>
+    <string name="class_confirmation_price">%2$d개의 보석을 사용하여 %1$s직업으로 전직하시겠습니까\?</string>
     <string name="subscription_confirmation">이제 1개월간 구독하였습니다</string>
     <string name="month_reminder_title">일과에 변화가 필요한가요\?</string>
     <string name="use_item">파티원에게 아이템 사용하기</string>&gt;
     <string name="unsaved_changes">저장되지 않은 변경사항들</string>
-    <string name="gift_confirmation_text_gems_new">%s님에게 %s개의 보석을 보냈습니다.</string>
+    <string name="gift_confirmation_text_gems_new">%1$s님에게 %2$s개의 보석을 보냈습니다.</string>
     <string name="gem_purchase_confirmation">%s개의 보석을 얻었습니다</string>
     <string name="leave_guild_challenges_confirmation">길드를 탈퇴할 때, 참여 중이던 도전 과제를 계속 수행하시겠습니까\?</string>
     <string name="subscription_confirmation_multiple">이제 %s개월간 구독하였습니다</string>
@@ -1060,11 +1059,11 @@
     <string name="hatch">부화시키기</string>
     <string name="delete_challenge_task_title">도전과제를 삭제하시겠습니까\?</string>
     <string name="suggest_pet_hatch_missing_potion">이 펫을 부화시키려면 %s의 물약이 필요합니다</string>
-    <string name="suggest_pet_hatch_missing_both">이 펫을 부화시키려면 %s와(과) %s의 물약이 필요합니다</string>
+    <string name="suggest_pet_hatch_missing_both">이 펫을 부화시키려면 %1$s와(과) %2$s의 물약이 필요합니다</string>
     <string name="suggest_pet_hatch_again_missing_egg">이 펫을 부화시키려면 %s의 알이 다시 필요합니다</string>
     <string name="suggest_pet_hatch_again_missing_potion">이 펫을 부화시키려면 %s의 물약이 다시 필요합니다</string>
-    <string name="suggest_pet_hatch_again_missing_both">이 펫을 부화시키려면 %s와(과) %s의 물약이 다시 필요합니다</string>
-    <string name="can_hatch_pet">이 펫을 부화시키기 위해 %s의 알과 %s의 물약을 조합하세요!</string>
+    <string name="suggest_pet_hatch_again_missing_both">이 펫을 부화시키려면 %1$s와(과) %2$s의 물약이 다시 필요합니다</string>
+    <string name="can_hatch_pet">이 펫을 부화시키기 위해 %1$s의 알과 %2$s의 물약을 조합하세요!</string>
     <string name="suggest_pet_hatch_missing_egg">이 펫을 부화시키려면 %s의 알이 필요합니다</string>
     <string name="disablePrivateMessages">쪽지 비활성화</string>
     <string name="unblock_user">사용자 차단 해제하기</string>
@@ -1084,14 +1083,14 @@
     <string name="block">차단</string>
     <string name="pms_disabled">쪽지가 비활성화 되어있습니다.</string>
     <string name="pms_disabled_description">당신은 여전히 쪽지를 보낼 수 있지만 아무도 당신에게 쪽지를 보낼 수 없습니다. 이 기능은 설정에서 다시 활성화할 수 있습니다.</string>
-    <string name="spooky_promo_info_instructions">%s와(과) %s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
+    <string name="spooky_promo_info_instructions">%1$s와(과) %2$s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
     <string name="how_it_works">어떻게 작동하나요</string>
     <string name="limitations">제한 사항</string>
     <string name="fall_promo_info_prompt">가을 갈라가 열려있습니다! 보석 세일의 최적의 기간이죠! 보석을 구매할 때 평소보다 많은 보석을 얻게됩니다.</string>
     <string name="view_gem_bundles">보석 꾸러미 보기</string>
     <string name="usually_x_gems">보통 %d보석</string>
-    <string name="x_to_y">%s부터 %s</string>
-    <string name="fall_promo_info_instructions">%s와(과) %s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
+    <string name="x_to_y">%1$s부터 %2$s</string>
+    <string name="fall_promo_info_instructions">%1$s와(과) %2$s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
     <string name="spooky_promo_info_prompt">보석 세일이 올해 가을 축제 마지막을 장식하고 있습니다! 지금이 어느 때보다 보석을 많이 얻을 수 있는 마지막 기회이니, 끝나기 전에 보석을 쟁여두세요!</string>
     <string name="dark_mode">다크 모드</string>
     <string name="theme_mode">테마 모드</string>
@@ -1213,7 +1212,7 @@
     <string name="you_ran_out_of_health">생명력이 모두 닳았습니다!</string>
     <string name="death_description">하지만 모두 돌려받을 수 있을 겁니다! 당신은 할 수 있어요!</string>
     <string name="faint_broken_equipment">부서진 장비는 보상에서 다시 구매할 수 있습니다</string>
-    <string name="faint_loss_description">레벨이 <b>%d</b>로 떨어지고, <b>%d</b>의 골드를 잃고, <b>장비</b>가 부서집니다…</string>
+    <string name="faint_loss_description">레벨이 <b>%1$d</b>로 떨어지고, <b>%2$d</b>의 골드를 잃고, <b>장비</b>가 부서집니다…</string>
     <string name="account_reset">계정 초기화</string>
     <string name="avatar_skin_customization">아바타 피부 커스텀</string>
     <string name="avatar_shirt_customization">아바타 상의 커스텀</string>
@@ -1263,4 +1262,4 @@
     <string name="class_changed_description">%s 스킬을 사용할 수 있고 상점에서 장비를 구매할 수 있습니다!</string>
     <string name="change_class_selected_confirmation">보석 3개를 사용하여 %1$s 직업으로 변경하시겠습니까\?</string>
     <string name="x_and_y">%1$s 와(과) %2$s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index ef1f9d671..d47b1c429 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Door het verwezelijken van je \'real life\' doelen ben je een niveau gestegen en ben je nu volledig geheeld!</string>
     <string name="onwards">Hoera!</string>
     <string name="faint_subtitle">Wanhoop niet!</string>
-    <string name="faint_penalty_body">Je verliest een niveau, je goud en een stuk uitrusting, maar je kunt ze allemaal terug krijgen door hard te werken! Succes—je zult het geweldig doen.</string>
     <string name="faint_header">Je hebt geen Levenspunten meer!</string>
     <string name="faint_button">Herstel Gezondheid &amp; probeer opnieuw</string>
     <string name="filter">Filter</string>
@@ -532,11 +531,11 @@
     <string name="world_boss">Wereldbaas</string>
     <string name="boss_art">Baas Kunst</string>
     <string name="world_boss_description">Wereldbaas beschrijving</string>
-    <string name="rage_strike_count">Woede Aanvallen: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Woede Aanvallen: %d/%d</string>
     <string name="pending_strike_title">Inkomende Aanval</string>
     <string name="strike_description_title">Wat is een Woede Aanval?</string>
     <string name="strike_active_title">De %s werd aangevallen!</string>
-    <string name="strike_active_description">Onze dierbare %s was verwoest toen de %s de %s verbrijzelde. Pak snel je taken aan om het monster te verslaan en te helpen herbouwen!</string>
+    <string name="strike_active_description">Onze dierbare %1$s was verwoest toen de %2$s de %3$s verbrijzelde. Pak snel je taken aan om het monster te verslaan en te helpen herbouwen!</string>
     <string name="questShop">Queestenwinkel</string>
     <string name="market_owner_long">Alex de Handelaar</string>
     <string name="tavern_owner_long">Daniel de herbergier</string>
@@ -701,7 +700,7 @@
     <string name="local">Lokaal</string>
     <string name="authentication_methods">Verificatiemethoden</string>
     <string name="someone">Iemand</string>
-    <string name="invitation_title">%s heeft je uitgenodigd voor diens groep %s</string>
+    <string name="invitation_title">%1$s heeft je uitgenodigd voor diens groep %2$s</string>
     <string name="password_too_short">Je wachtwoord moet minimaal %d karakters lang zijn</string>
     <string name="copy_username">Kopieer Gebruikersnaam</string>
     <string name="id_copied">Gebruikers ID naar het klembord gekopieerd</string>
@@ -817,7 +816,7 @@
     <string name="preference_push_important_announcements">Belangrijke mededelingen</string>
     <string name="damage_paused">Schade is onderbroken</string>
     <string name="discover">Ontdekken</string>
-    <string name="gift_confirmation_text_sub">Je hebt %s een %s-maand Habitica abonnement gestuurd.</string>
+    <string name="gift_confirmation_text_sub">Je hebt %1$s een %2$s-maand Habitica abonnement gestuurd.</string>
     <string name="task_title">Taaktitel</string>
     <string name="create_party">Een nieuwe groep aanmaken</string>
     <string name="only_leader_create_challenge">Alleen de leider kan uitdagingen creëren</string>
@@ -855,7 +854,7 @@
     <string name="report_message_hint">Reden voor melding (optioneel)</string>
     <string name="report_message_title">%s melden wegens overtreding:</string>
     <string name="report_explanation">Meld **alleen** een bericht dat de [Communityrichtlijnen](https://habitica.com/static/community-guidelines) en/of [Servicevoorwaarden](https://habitica.com/static/terms) schendt. Het ongepast melden van een bericht kan een overtreding opleveren.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Je hebt %s een %s-maand Habitica-abonnement gestuurd en hetzelfde abonnement is toegepast op je account voor onze Gift One Get One-promotie!</string>
+    <string name="gift_confirmation_text_sub_g1g1">Je hebt %1$s een %2$s-maand Habitica-abonnement gestuurd en hetzelfde abonnement is toegepast op je account voor onze Gift One Get One-promotie!</string>
     <string name="gift_gems_subtitle">Kies hieronder het edelsteenpakket dat je cadeau wilt doen!</string>
     <string name="gift_subscription_subtitle">Kies hieronder het abonnement dat u wilt schenken! Deze aankoop wordt niet automatisch verlengd.</string>
     <string name="gift_one_get_one_detailed_description">Terwijl deze promotie actief is, ontvang je zelf, automatisch hetzelfde abonnement nadat je je cadeau hebt verzonden.</string>
@@ -973,7 +972,7 @@
     <string name="is_open">Openen</string>
     <string name="discard">Gooi weg</string>
     <string name="rejoin_party">Je kan deze groep niet weer inkomen zonder uitnodiging.</string>
-    <string name="class_confirmation_price">Wil je jouw klasse veranderen naar %s voor %d edelstenen\?</string>
+    <string name="class_confirmation_price">Wil je jouw klasse veranderen naar %1$s voor %2$d edelstenen\?</string>
     <string name="quest_items_found">Je hebt %d queeste-voorwerpen gevonden</string>
     <string name="leave_delete_tasks">Verlaat en verwijder Taken</string>
     <string name="guild_challenges">Je neemt deel aan een Gilde Uitdaging</string>
@@ -996,4 +995,4 @@
     <string name="usernames_party">%s\'s Groep</string>
     <string name="your_tags">Jouw tags</string>
     <string name="challenge_tags">Uitdagingen tags</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index f9b9e7426..a7f049055 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -486,7 +486,7 @@
     <string name="world_boss">Boss ogólnoświatowy</string>
     <string name="boss_art">Obrazek bossa</string>
     <string name="world_boss_description">Opis Ogólnoświatowego Bossa</string>
-    <string name="rage_strike_count">Ataki Szału: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Ataki Szału: %d/%d</string>
     <string name="pending_strike_title">Oczekujący Atak</string>
     <string name="strike_description_title">Czym jest Atak Szału?</string>
     <string name="strike_active_title">%s został zaatakowany!</string>
@@ -533,7 +533,6 @@
     <string name="gift_confirmation_title">Twój prezent został wysłany!</string>
     <string name="discover">Odkryj</string>
     <string name="preference_push_important_announcements">Ważne Ogłoszenia</string>
-    <string name="faint_penalty_body">Straciłeś poziom, złoto i przedmiot z wyposażenia, ale możesz je odzyskać poprzez ciężką pracę! Powodzenia — uda ci się.</string>
     <string name="reminder_title">Pamiętaj aby odznaczyć swoje zadania</string>
     <string name="ago_minutes">%d minut temu</string>
     <string name="ago_hours">%d godzin temu</string>
@@ -558,7 +557,7 @@
     <string name="identify_your_challenge_with_a_tag">Określ wyzwanie krótką nazwą</string>
     <string name="gems_left_max">Miesięczne Klejnoty: pozostało %1$d/%2$d</string>
     <string name="forgot_password_confirmation">Instrukcja dotyczącą ustawiania nowego hasła zostanie wysłana na e-mail, o ile został on ustawiony w profilu.</string>
-    <string name="strike_active_description">Nasz ukochany %s został zdewastowany, gdy %s roztrzaskał %s. Szybko, kończ swoje zadania, żeby pokonać potwora i pomóc w odbudowie!!</string>
+    <string name="strike_active_description">Nasz ukochany %1$s został zdewastowany, gdy %2$s roztrzaskał %3$s. Szybko, kończ swoje zadania, żeby pokonać potwora i pomóc w odbudowie!!</string>
     <string name="equipment_str">SIŁ:</string>
     <string name="equipment_con">KON:</string>
     <string name="equipment_int">INT:</string>
@@ -757,7 +756,7 @@
     <string name="armoireFood_new">Szperasz w Skrzyni i znajdujesz jedzenie. Co to tutaj robi\?</string>
     <string name="sell_no_price">Sprzedaj</string>
     <string name="create_new_party">Stwórz nową drużynę</string>
-    <string name="class_confirmation_price">Czy chcesz zmienić swoją klasę na %s za %d klejnotów\?</string>
+    <string name="class_confirmation_price">Czy chcesz zmienić swoją klasę na %1$s za %2$d klejnotów\?</string>
     <string name="next_hourglass">Następna klepsydra</string>
     <string name="guild_challenges">Bierzesz udział w wyzwaniu gildii</string>
     <string name="party_challenges">Bierzesz udział w wyzwaniu drużyny</string>
@@ -877,7 +876,7 @@
     <string name="subscribers_mythic_hourglasses"><i>Subskrybenci otrzymują Mistyczną Klepsydrę w pierwszych trzech dniach miesiąca.</i></string>
     <string name="member_group_plan">Członek Planu Grupowego</string>
     <string name="g1g1_info_3_text">Aby skorzystać z promocji, należy podarować Subskrybcję innemu użytkownikowi Habitica. Jeśli Ty lub osoba otrzymująca Twój prezent już posiada Subskrybcję, miesiące z tego zakupu zostaną wykorzystane dopiero po zakończeniu lub zrezygnowaniu z bieżącej Subskrybcji.</string>
-    <string name="invitation_title">Użytkownik %s zaprosił cię do grupy %s</string>
+    <string name="invitation_title">Użytkownik %1$s zaprosił cię do grupy %2$s</string>
     <string name="copy_username">Skopiuj nazwę użytkownika</string>
     <string name="password_too_short">Twoje hasło musi zawierać przynajmniej %d znaków</string>
     <string name="authentication_methods">Metody Uwierzytelnienia</string>
@@ -1082,14 +1081,14 @@
     <string name="block_user">Zablokuj użytkownika</string>
     <string name="unblock_user">Odblokuj użytkownika</string>
     <string name="block_user_title">Zablokować %s\?</string>
-    <string name="spooky_promo_info_instructions">Czas promocji: %s-%s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
+    <string name="spooky_promo_info_instructions">Czas promocji: %1$s-%2$s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
     <string name="g1g1_promo_info_instructions">Dotknij \"Podaruj Subskrybcję\" i wpisz nazwę użytkownika, któremu chcesz ją podarować. Następnie wybierz okres Subskrybcji i dokończ zakup. Twojemu kontu automatycznie zostanie przypisana Subskrybcja z takim samym okresem i korzyściami.</string>
     <string name="pms_disabled">Prywatne wiadomości są wyłączone</string>
     <string name="pms_disabled_description">Nadal jesteś w stanie wysyłać wiadomości, ale nie będziesz otrzymywać wiadomości od innych. Możesz to zmienić w dowolniej chwili w ustawieniach.</string>
     <string name="x_to_y">%1$s-%2$s</string>
     <string name="how_it_works">Jak to działa</string>
     <string name="limitations">Ograniczenia</string>
-    <string name="fall_promo_info_instructions">Czas promocji: %s-%s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
+    <string name="fall_promo_info_instructions">Czas promocji: %1$s-%2$s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
     <string name="view_gem_bundles">Przejdź do pakietów Klejnotów</string>
     <string name="dark_mode">Tryb ciemny</string>
     <string name="theme_mode">Tryb motywu</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 1d720888d..680631038 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Por completar seus objetivos da vida real, você subiu de nível e agora está totalmente curado!</string>
     <string name="onwards">Hurra!</string>
     <string name="faint_subtitle">Não se desespere!</string>
-    <string name="faint_penalty_body">Você perdeu um Nível, seu Ouro, e uma peça de Equipamento, mas você pode ganhar todos eles de volta com trabalho duro! Boa sorte — Você se sairá bem.</string>
     <string name="faint_header">Você perdeu toda sua Vida!</string>
     <string name="faint_button">Restaurar Vida &amp; Tentar Novamente</string>
     <string name="filter">Filtro</string>
@@ -534,11 +533,11 @@
     <string name="world_boss">Chefão Global</string>
     <string name="boss_art">Arte do Chefão</string>
     <string name="world_boss_description">Descrição do Chefão Global</string>
-    <string name="rage_strike_count">Strikes de Raiva: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Strikes de Raiva: %d/%d</string>
     <string name="pending_strike_title">Strike Pendente</string>
     <string name="strike_description_title">O que é um Strike de Raiva?</string>
     <string name="strike_active_title">O %s foi Atacado!</string>
-    <string name="strike_active_description">Nossa amada %s foi devastada quando o %s quebrou o %s. Rápido, enfrente suas tarefas para derrotar o monstro e ajudar a reconstruir!!</string>
+    <string name="strike_active_description">Nossa amada %1$s foi devastada quando o %2$s quebrou o %3$s. Rápido, enfrente suas tarefas para derrotar o monstro e ajudar a reconstruir!!</string>
     <string name="questShop">Loja de Missões</string>
     <string name="market_owner_long">Alex o Mercante</string>
     <string name="tavern_owner_long">Daniel o estalajadeiro</string>
@@ -677,7 +676,7 @@
     <string name="local">local</string>
     <string name="authentication_methods">Métodos de autenticação</string>
     <string name="someone">Alguém</string>
-    <string name="invitation_title">%s te convidou para se juntar ao grupo %s</string>
+    <string name="invitation_title">%1$s te convidou para se juntar ao grupo %2$s</string>
     <string name="password_too_short">Sua senha deve ter pelo menos %d caracteres</string>
     <string name="copy_username">Copiar nome de usuário</string>
     <string name="id_copied">ID de usuário copiado para a área de transferência</string>
@@ -1034,10 +1033,10 @@
     <string name="unblock_user">Desbloquear Usuário</string>
     <string name="block_user">Bloquear Usuário</string>
     <string name="spooky_promo_info_prompt">A Promoção de Gemas está de volta para assombrar o final do Festival de Outono deste ano! Esta é a última chance de conseguir mais Gemas do que nunca, então estoque enquanto dura!</string>
-    <string name="spooky_promo_info_instructions">Entre %s e %s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com a quantidade promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
+    <string name="spooky_promo_info_instructions">Entre %1$s e %2$s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com a quantidade promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
     <string name="view_gem_bundles">Ver Pacotes de Gemas</string>
     <string name="fall_promo_info_prompt">O Festival de Outono está em pleno andamento, então pensamos que era o momento perfeito para apresentar nossa primeira Promoção de Gemas! Agora você obterá mais Gemas com cada compra do que nunca.</string>
-    <string name="fall_promo_info_instructions">Entre %s e %s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com o valor promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
+    <string name="fall_promo_info_instructions">Entre %1$s e %2$s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com o valor promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
     <string name="limitations">Limitações</string>
     <string name="how_it_works">Como funciona</string>
     <string name="x_to_y">%1$s a %2$s</string>
@@ -1139,7 +1138,7 @@
     <string name="disconnect">Desconectar</string>
     <string name="add">Adicionar</string>
     <string name="discard">Descartar</string>
-    <string name="class_confirmation_price">Você quer mudar sua Classe para %s por %d Gemas\?</string>
+    <string name="class_confirmation_price">Você quer mudar sua Classe para %1$s por %2$d Gemas\?</string>
     <string name="use_item">Use o item em um membro do grupo</string>&gt;
     <string name="unsaved_changes">Mudanças não salvas</string>
     <string name="discard_changes_to_task_message">Tem certeza que deseja desfazer as mudanças desta tarefa\?</string>
@@ -1223,7 +1222,7 @@
     <string name="mor_gems_title">Você precisará de mais Gemas para comprar isso!</string>
     <string name="gems_support">Comprar Gemas ajuda nossa pequena equipe do Habitica</string>
     <string name="month_released">Lançamento do mês</string>
-    <string name="faint_loss_description">Você irá cair para o nível <b>%d</b>, perderá <b>%d</b> Ouro e <b>uma peça de seu equipamento</b> será destruída… Você pode recuperá-los com trabalho duro!</string>
+    <string name="faint_loss_description">Você irá cair para o nível <b>%1$d</b>, perderá <b>%2$d</b> Ouro e <b>uma peça de seu equipamento</b> será destruída… Você pode recuperá-los com trabalho duro!</string>
     <string name="avatar_skin_customization">Personalização da pele do avatar</string>
     <string name="incorrect_password">A senha está incorreta</string>
     <string name="habitica_official">Habitica Oficial</string>
@@ -1442,7 +1441,6 @@
     <string name="report_successful">%s Denunciado</string>
     <string name="report_failure">Falha na denúncia, por favor, tente novamente mais tarde</string>
     <string name="report_player_toolbar_title">Denunciar %s</string>
-    <string name="g1g1_promo_info_limitations_fixed">Este é um evento por tempo limitado que começa em %1$s (%2$s) e terminará em %3$s (%4$s). Esta promoção só se aplica ao presentear outro Habiticano. Se você ou o destinatário do presente já tiverem uma assinatura, a assinatura presenteada adicionará meses de crédito que só serão utilizados após o cancelamento ou expiração da assinatura atual.</string>
     <string name="item_footer_description">Confira o [Market](/shops/market) para comprar apenas o que você precisa!</string>
     <string name="visit_market">Visitar Mercado</string>
     <string name="empty_quests_description">Obtenha Missões ao subir de nível, bônus de login ou na [Quest Shop](/shops/quests)!</string>
@@ -1494,4 +1492,4 @@
     <string name="sub_perk">BENEFÍCIO SUB</string>
     <string name="subscribe_second_chance_incentive_text">Os assinantes têm uma segunda chance na vida todos os dias e esses outros benefícios!</string>
     <string name="watch_ad_to_hang_on">Assista ao anúncio para aguentar o 1HP!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index f2f9dd947..fba2ae607 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -338,7 +338,6 @@
     <string name="quest_owner_rewards">Recompensas do Dono de Missão</string>
     <string name="levelup_header">Alcançaste o Nível %1$d!</string>
     <string name="levelup_detail">Por completares os teus objectivos na vida real, subiste de nível e agora estás totalmente curado!</string>
-    <string name="faint_penalty_body">Perdeste um Nível. o teu Ouro, e uma peça de Equipamento, mas podes recuperá-los de volta com trabalho árduo! Boa sorte — Vais-te sair bem.</string>
     <string name="reminder_title">Lembra-te de marcares as tuas Diárias</string>
     <string name="intro_2_title">Progresso na vida</string>
     <string name="intro_2_description">Desbloqueia recursos no jogo ao completares as tuas tarefas da vida real. Ganha armaduras, animais de estimação, e mais como recompensas por atingires os teus objectivos.</string>
@@ -504,10 +503,10 @@
     <string name="tavern_owner_long">Daniel o dono da Taverna</string>
     <string name="market_owner_long">Alex o Mercador</string>
     <string name="questShop">Loja de Missões</string>
-    <string name="strike_active_description">Nosso querido %s ficou devastado quando %s aniquilou %s. Rapido, enfrente tuas tarefas para derrotar o monstro e ajudar a reconstruir !!</string>
+    <string name="strike_active_description">Nosso querido %1$s ficou devastado quando %2$s aniquilou %3$s. Rapido, enfrente tuas tarefas para derrotar o monstro e ajudar a reconstruir !!</string>
     <string name="strike_active_title">%s foi Atacado!</string>
     <string name="pending_strike_title">Ataque Pendente</string>
-    <string name="rage_strike_count">Ataques de Fúria: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Ataques de Fúria: %d/%d</string>
     <string name="world_boss">Chefão Mundial</string>
     <string name="boss_art">Arte do Chefão</string>
     <string name="world_boss_description">Descrição do Chefão Mundial</string>
@@ -704,7 +703,7 @@
     <string name="equipment_empty">Já tens todo o equipamento! Mais vai ser lançado durante as Grandes Galas, perto dos solstícios e equinócios.</string>
     <string name="quest_items_found">Encontraste %d itens da jornada</string>
     <string name="discard">Descartar</string>
-    <string name="class_confirmation_price">Queres mudar a tua classe para %s por %d gemas\?</string>
+    <string name="class_confirmation_price">Queres mudar a tua classe para %1$s por %2$d gemas\?</string>
     <string name="use_item">Usar item em membro de equipa</string>&gt;
     <string name="unsaved_changes">Alterações não gravadas</string>
     <string name="discard_changes_to_task_message">Tens a certeza de que queres descartar as alterações nesta tarefa\?</string>
diff --git a/Habitica/res/values-ro/strings.xml b/Habitica/res/values-ro/strings.xml
index 9a4d15a2a..3ba811c18 100755
--- a/Habitica/res/values-ro/strings.xml
+++ b/Habitica/res/values-ro/strings.xml
@@ -481,7 +481,7 @@
     <string name="pending_strike_title">Lovitură iminentă</string>
     <string name="strike_description_title">Ce este o Lovitură Furioasă?</string>
     <string name="strike_active_title" formatted="false">%s a fost Atacat!</string>
-    <string name="strike_active_description" formatted="false">Dragul nostru %s a fost devastat atunci când %s a distrus %s. Îndeplinește-ți sarcinile rapid pentru a înfrânge monstrul și a ajuta la reconstrucție! </string>
+    <string name="strike_active_description">Dragul nostru %1$s a fost devastat atunci când %2$s a distrus %3$s. Îndeplinește-ți sarcinile rapid pentru a înfrânge monstrul și a ajuta la reconstrucție! </string>
     <string name="questShop">Magazinul de Expediții</string>
     <string name="market_owner_long">Alex Negustorul</string>
     <string name="tavern_owner_long">Daniel Păzitorul Hanului</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index d7371238c..aecd63590 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Благодаря выполнению своих целей в реальной жизни вы получили уровень и восполнили полностью здоровье!</string>
     <string name="onwards">Вперёд!</string>
     <string name="faint_subtitle">Не отчаивайтесь!</string>
-    <string name="faint_penalty_body">Вы потеряли Уровень, Золото и предмет Экипировки, но вы сможете все вернуть, если продолжите выполнять задачи! Удачи! Вы справитесь.</string>
     <string name="faint_header">У вас закончилось здоровье!</string>
     <string name="faint_button">Восстановить здоровье &amp; Попробовать ещё раз</string>
     <string name="filter">Фильтр</string>
@@ -526,11 +525,11 @@
     <string name="world_boss">Мировой босс</string>
     <string name="boss_art">Изображение босса</string>
     <string name="world_boss_description">Описание мирового босса</string>
-    <string name="rage_strike_count">Ярость: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Ярость: %d/%d</string>
     <string name="pending_strike_title">Ожидаемый урон</string>
     <string name="strike_description_title">Что такое Удар Ярости?</string>
     <string name="strike_active_title">Атаковали %s!</string>
-    <string name="strike_active_description">Наш любимый %s был печально потрясен, когда %s порушил %s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
+    <string name="strike_active_description">Наш любимый %1$s был печально потрясен, когда %2$s порушил %3$s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
     <string name="questShop">Лавка квестов</string>
     <string name="market_owner_long">Торговец Александр</string>
     <string name="tavern_owner_long">Даниэль, хозяин гостиницы</string>
@@ -800,7 +799,7 @@
     <string name="beastMasterTitle">Повелитель зверей</string>
     <string name="partyOnDescription">Ваша команда увеличилась до 4 участников!</string>
     <string name="partyUpDescription">Вы объединились с членом команды!</string>
-    <string name="invitation_title">%s пригласил(-а) вас в группу %s</string>
+    <string name="invitation_title">%1$s пригласил(-а) вас в группу %2$s</string>
     <string name="id_copied">ID пользователя cкопирован в буфер обмена</string>
     <string name="preference_push_unjoined_guild_mention">\@Упоминания в остальных Гильдиях</string>
     <string name="preference_push_joined_guild_mention">\@Упоминания в моих Гильдиях</string>
@@ -966,10 +965,10 @@
     <string name="theme_mode">Режим (Темный/Светлый)</string>
     <string name="dark_mode">Темная тема</string>
     <string name="spooky_promo_info_prompt">Распродажа самоцветов возвращается до конца Осеннего фестиваля этого года! Это последний шанс, чтобы получить больше самоцветов, чем когда-либо, так что запасайтесь пока не поздно!</string>
-    <string name="spooky_promo_info_instructions">Между %s и %s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
+    <string name="spooky_promo_info_instructions">Между %1$s и %2$s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
     <string name="view_gem_bundles">Посмотреть наборы самоцветов</string>
     <string name="fall_promo_info_prompt">Осенний фестиваль идет полным ходом, так что мы подумали, что это идеальное время, чтобы представить нашу первую в истории распродажу самоцветов! Теперь вы можете получить больше самоцветов с каждой покупки, чем когда-либо прежде.</string>
-    <string name="fall_promo_info_instructions">Между %s и %s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
+    <string name="fall_promo_info_instructions">Между %1$s и %2$s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
     <string name="pms_disabled_description">Вы всё ещё можете отправлять сообщения, но никто не может отправлять их вам. Вы можете изменить это в настройках.</string>
     <string name="block_user_description">Заблокированный игрок не может отправлять вам личные сообщения, но вы все равно будете видеть его сообщения</string>
     <string name="challenge_task_name">%s задание испытания</string>
@@ -1125,7 +1124,7 @@
     <string name="about_me">Обо мне</string>
     <string name="my_account">Мой аккаунт</string>
     <string name="public_profile">Публичный профиль</string>
-    <string name="class_confirmation_price">Хотите сменить ваш класс на %s за %d самоцветов\?</string>
+    <string name="class_confirmation_price">Хотите сменить ваш класс на %1$s за %2$d самоцветов\?</string>
     <string name="use_item">Использовать предмет на члена команды</string>&gt;
     <string name="unsaved_changes">Изменения не сохранены</string>
     <string name="gift_confirmation_text_gems_new">Вы отправили @%1$s %2$s самоцветов.</string>
@@ -1220,7 +1219,7 @@
     <string name="death_description">Но вы сможете вернуть все это упорным трудом! Удачи - у вас все получится.</string>
     <string name="faint_broken_equipment">Сломанное снаряжение можно
 \nвыкупить обратно из Вознаграждений</string>
-    <string name="faint_loss_description">Ваш уровень понижен до <b>%d</b>, вы потеряли <b>%d</b> золота(-о) и сломали <b>часть вашей экипировки</b>… Вы сможете вернуть все это упорным трудом!</string>
+    <string name="faint_loss_description">Ваш уровень понижен до <b>%1$d</b>, вы потеряли <b>%2$d</b> золота(-о) и сломали <b>часть вашей экипировки</b>… Вы сможете вернуть все это упорным трудом!</string>
     <string name="account_reset">Сброс учетной записи</string>
     <string name="avatar_skin_customization">Персонализация кожи аватара</string>
     <string name="avatar_shirt_customization">Персонализация рубашки аватара</string>
@@ -1333,7 +1332,6 @@
     <string name="report_challenge_explanation">Вы должны сообщать только о тех проблемах, которые нарушают [Правила сообщества](https://habitica.com/static/community-guidelines) и/или [Условия предоставления услуг](https://habitica.com/static/terms). Подача ложного сообщения является нарушением Правил сообщества Habitica.</string>
     <string name="report_successful">%s жалоба отправлена</string>
     <string name="unmute_user_confirm">Хотите разрешить этому пользователю использовать чат\?</string>
-    <string name="g1g1_promo_info_limitations_fixed">Это ограниченное по времени мероприятие, которое начнется в %1$s (%2$s) и закончится в %3$s (%4$s). Эта акция действует только в том случае, если вы дарите подписку другому игроку Habitica. Если у вас или у получателя подарка уже есть подписка, подаренная подписка добавит несколько месяцев кредита, который можно будет использовать только после отмены или истечения срока действия текущей подписки.</string>
     <string name="assigned_to">Назначен на</string>
     <string name="gems_promo_info_limitations_fixed">Акция действует ограниченное время. Это мероприятие начинается с %1$s (%2$s) и закончится %3$s (%4$s). Промо доступно только при покупке драгоценных камней для себя.</string>
     <string name="promote_to_manager">Повысить до менеджера</string>
@@ -1403,4 +1401,4 @@
     <string name="background">Фон</string>
     <string name="undo">Отменить</string>
     <string name="day_x">День %d</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml
index 0bf62180e..fde09c862 100755
--- a/Habitica/res/values-sv/strings.xml
+++ b/Habitica/res/values-sv/strings.xml
@@ -604,7 +604,7 @@
     <string name="setup_task_join_habitica">Gå med i Habitica (Bocka av mig!)</string>
     <string name="limitations">Begränsningar</string>
     <string name="how_it_works">Hur det funkar</string>
-    <string name="x_to_y">%s till %s</string>
+    <string name="x_to_y">%1$s till %2$s</string>
     <string name="block_user">Blockera Användar</string>
     <string name="tavern_inn_checkOut">Återaktivera dina dagliga uppgifter</string>
     <string name="learn_more">Lär Mer</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index bcf21fd41..04c6e4910 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">Gerçek hayattaki hedeflerini gerçekleştirerek seviye atladın ve sağlığın yenilendi!</string>
     <string name="onwards">Yaşasın!</string>
     <string name="faint_subtitle">Umudunu kaybetme!</string>
-    <string name="faint_penalty_body">Bir Seviye, Altınlarını ve bir parça Ekipman kaybettin, ama çok çalışarak hepsini yeniden kazanabilirsin! İyi şanslar—bu işi başaracaksın.</string>
     <string name="faint_header">Sağlığın tükendi!</string>
     <string name="faint_button">Sağlığını Doldur &amp; Tekrar Dene</string>
     <string name="filter">Filtre</string>
@@ -532,11 +531,11 @@
     <string name="world_boss">Dünya Canavarı</string>
     <string name="boss_art">Canavar Görseli</string>
     <string name="world_boss_description">Dünya Canavarı Tanımı</string>
-    <string name="rage_strike_count">Öfke Saldırıları: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Öfke Saldırıları: %d/%d</string>
     <string name="pending_strike_title">Bekleyen Saldırı</string>
     <string name="strike_description_title">Öfke Saldırısı nedir?</string>
     <string name="strike_active_title">%s Saldırıya uğradı!</string>
-    <string name="strike_active_description">Çok sevdiğimiz %s hüsrana uğradı çünkü %s, %s ve çevresini paramparça etti. Çabuk, canavarı yenmek ve yeniden inşaya yardım etmek için işlerine sarıl!</string>
+    <string name="strike_active_description">Çok sevdiğimiz %1$s hüsrana uğradı çünkü %2$s, %3$s ve çevresini paramparça etti. Çabuk, canavarı yenmek ve yeniden inşaya yardım etmek için işlerine sarıl!</string>
     <string name="questShop">Görev Dükkanı</string>
     <string name="market_owner_long">Tüccar Alex</string>
     <string name="tavern_owner_long">Hancı Daniel</string>
@@ -795,7 +794,7 @@
     <string name="feedPet_title">Bir evcil hayvan besle</string>
     <string name="group_plan">Grup Aboneliği</string>
     <string name="gift_gems_balance_subtitle">Aşağıya kaç Elmas göndermek istediğini gir veya hediye etmek üzere Elmas satın almak için sekmeleri değiştir</string>
-    <string name="invitation_title">%s seni %s grubuna katılman için davet etti</string>
+    <string name="invitation_title">%1$s seni %2$s grubuna katılman için davet etti</string>
     <string name="gems_to_gift">Hediye edilecek taşlar</string>
     <string name="from_balance">Bakiyeden Gönder</string>
     <string name="partyOnDescription">Takımın 4 üyeye ulaştı!</string>
@@ -938,9 +937,9 @@
     <string name="assigned_stat">Atanan İstatistik</string>
     <string name="join_party_description_guild">Aşağıdaki kullanıcı adını bir arkadaşınıza verin veya potansiyel yoldaşlarla tanışmak için %s gidin!</string>
     <string name="spooky_promo_info_prompt">Değerli Taş Satışı, bu yılki Sonbahar Galasının en sonunda tekrar gündeme geldi! Bu, her zamankinden daha fazla Mücevher almak için son bir şans, bu yüzden bu süre boyunca stok yapın!</string>
-    <string name="spooky_promo_info_instructions">%s ile %s arasında, her zamanki gibi herhangi bir Mücevher paketi satın alın ve hesabınıza promosyon miktarda Mücevher yatırılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
+    <string name="spooky_promo_info_instructions">%1$s ile %2$s arasında, her zamanki gibi herhangi bir Mücevher paketi satın alın ve hesabınıza promosyon miktarda Mücevher yatırılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
     <string name="fall_promo_info_prompt">Sonbahar Galası tüm hızıyla devam ediyor, bu yüzden ilk Mücevher Satışımızı sunmak için mükemmel bir zaman olduğunu düşündük! Artık her satın alma işleminde her zamankinden daha fazla Mücevher kazanacaksınız.</string>
-    <string name="fall_promo_info_instructions">%s ve %s arasında, her zamanki gibi herhangi bir Gem paketi satın alın ve hesabınıza promosyon miktarda Mücevher kredisi aktarılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
+    <string name="fall_promo_info_instructions">%1$s ve %2$s arasında, her zamanki gibi herhangi bir Gem paketi satın alın ve hesabınıza promosyon miktarda Mücevher kredisi aktarılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
     <string name="how_it_works">Nasıl çalışır</string>
     <string name="x_to_y">%1$s - %2$s</string>
     <string name="usually_x_gems">Genellikle %d Mücevher</string>
@@ -1203,7 +1202,7 @@
     <string name="armoire_rate_equipment_title">60% parça ekipman</string>
     <string name="armoire_rate_food_title">20% Yem</string>
     <string name="purchased">Satın Alındı</string>
-    <string name="class_confirmation_price">Sınıfını %s\'ye %d Elmas için değiştirmek istiyor musun\?</string>
+    <string name="class_confirmation_price">Sınıfını %1$s\'ye %2$d Elmas için değiştirmek istiyor musun\?</string>
     <string name="subscription_credit_canceling">Sizin <b>+%d</b> aylık abonelik krediniz aboneliğinizi iptal ettikten sonra etkinleşecek</string>
     <string name="unsaved_changes">Kaydedilmemiş Değişiklikler</string>
     <string name="armoire_rate_equipment_description">Yeni Ekipman parçaları her ay eklenir. Eğer bütün Ekipmanlara sahipsen, o zaman Yem ya da Deneyim alırsın, 50/50 şans.</string>
@@ -1252,7 +1251,7 @@
     <string name="mor_gems_title">Bunu almak için daha fazla elmas lazım!</string>
     <string name="gems_support">Elmas satın almak bizim küçük Habitica takımımızı destekler</string>
     <string name="month_released">Yayımlandığı Ay</string>
-    <string name="faint_loss_description">Seviye <b>%d</b>\'e düşecek, <b>%d</b> Altın kaybedecek, ve <b>bir parça ekipman</b> kıracaksın…</string>
+    <string name="faint_loss_description">Seviye <b>%1$d</b>\'e düşecek, <b>%2$d</b> Altın kaybedecek, ve <b>bir parça ekipman</b> kıracaksın…</string>
     <string name="account_reset">Hesap Sıfırlama</string>
     <string name="avatar_skin_customization">Avatar Kıyafeti Özelleştirme</string>
     <string name="delete_account_subscription_active">Aktif bir aboneliğin içindeyken hesabını silemezsin. Lütfen önce aboneliğini iptal et.</string>
diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml
index adc98c7b2..5e2dd950c 100755
--- a/Habitica/res/values-uk/strings.xml
+++ b/Habitica/res/values-uk/strings.xml
@@ -130,7 +130,6 @@
     <string name="tavern_inn_rest">Призупинити щоденні завдання</string>
     <string name="tavern_inn_checkOut">Знову активувати щоденні завдання</string>
     <string name="reminder_title">Не забудьте зазначити виконані завдання</string>
-    <string name="faint_penalty_body">Ви втратили рівень, своє золото і предмет екіпіровки, але ви можете все повернути, якщо будете працювати! Щасти! У вас все вийде.</string>
     <string name="onwards">Вперед!</string>
     <string name="levelup_detail">Завдяки досягненню цілей у реальному житті ваш рівень підвищився та персонаж був зцілений!</string>
     <string name="levelup_header">Ви отримали %1$d рівень!</string>
@@ -754,11 +753,11 @@
     <string name="active_world_boss">Активний світовий бос</string>
     <string name="hide_boss_art">Приховати зображення боса</string>
     <string name="questShop">Магазин квестів</string>
-    <string name="strike_active_description">Наш улюблений %s був спустошений, коли %s розбив %s. Швидко завершуйте свої завдання, щоб перемогти монстра і допомогти з відновленням!</string>
+    <string name="strike_active_description">Наш улюблений %1$s був спустошений, коли %2$s розбив %3$s. Швидко завершуйте свої завдання, щоб перемогти монстра і допомогти з відновленням!</string>
     <string name="strike_active_title">%s був атакований!</string>
     <string name="strike_description_title">Що таке Удар Люті\?</string>
     <string name="pending_strike_title">Очікувана шкода</string>
-    <string name="rage_strike_count">Удари люті: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Удари люті: %d/%d</string>
     <string name="world_boss_description">Опис світового боса</string>
     <string name="boss_art">Зображення боса</string>
     <string name="world_boss">Світовий бос</string>
@@ -977,7 +976,7 @@
     <string name="cancel_subscription_group_plan">У вас є безкоштовна підписка тому, що Група або Гільдія має груповий план підписка. Це закінчиться, якщо Ви покинете Групу, або підписка закінчиться. Будь-які місяці додаткового кредиту на підписку будуть застосовуватися в кінці Групового плану.</string>
     <string name="subscription_credit">Кредит на підписку</string>
     <string name="not_recurring">Не Повторююється</string>
-    <string name="invitation_title">%s запросив(-ла) Вас до групи %s</string>
+    <string name="invitation_title">%1$s запросив(-ла) Вас до групи %2$s</string>
     <string name="partyOnTitle">Час вечірки</string>
     <string name="partyUpTitle">Об\'єднуйтесь</string>
     <string name="update_available">Нове оновлення: %1$s (%2$d)</string>
@@ -1003,9 +1002,9 @@
     <string name="gift_one_get_one_detailed_description">Допоки ця акція активна, ви отримуєте відповідну підписку автоматично після відправки подарунка.</string>
     <string name="confirm_username_description">Підтвердження свого Ім\'я користувача дає змогу приймати запрошення, @згадки і повідомлення. Ви можете змінити своє Ім\'я користувача в будь-який час в налаштуваннях.</string>
     <string name="spooky_promo_info_prompt">Розпродаж самоцвітів повернувся до самого кінця цьогорічної гала-осені! Це останній шанс отримати більше самоцвітів, ніж будь-коли, тож запасіться, поки це триває!</string>
-    <string name="spooky_promo_info_instructions">У період з %s по %s просто придбайте будь-який комплект самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано їх додаткове число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
+    <string name="spooky_promo_info_instructions">У період з %1$s по %2$s просто придбайте будь-який комплект самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано їх додаткове число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
     <string name="fall_promo_info_prompt">Fall Gala у розпалі, тому ми подумали, що це ідеальний час, щоб представити нашу першу в історії розпродаж самоцвітів! Тепер ви отримаєте більше самоцвітів з кожною покупкою, ніж будь-коли раніше.</string>
-    <string name="fall_promo_info_instructions">У період з %s по %s просто придбайте будь-який комплект Самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано додаткове їх число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
+    <string name="fall_promo_info_instructions">У період з %1$s по %2$s просто придбайте будь-який комплект Самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано додаткове їх число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
     <string name="x_to_y">%1$s до %2$s</string>
     <string name="usually_x_gems">Зазвичай %d самоцвітів</string>
     <string name="block_user_description">Заблокований користувач не може писати вам особисто, але ви можете бачити його повідомлення деінде.</string>
@@ -1144,7 +1143,7 @@
     <string name="successful_purchase_generic">Успішна купівля</string>
     <string name="task_list_mode">Режим списку завдань</string>
     <string name="discard">Не зберігати</string>
-    <string name="class_confirmation_price">Ви хочете змінити свій клас на %s за %d самоцвітів\?</string>
+    <string name="class_confirmation_price">Ви хочете змінити свій клас на %1$s за %2$d самоцвітів\?</string>
     <string name="use_item">Застосуйте до члена команди</string>&gt;
     <string name="unsaved_changes">Незбережені зміни</string>
     <string name="gift_confirmation_text_gems_new">Ви надіслали @%1$s %2$s самоцвіт(-и/ів).</string>
@@ -1267,7 +1266,7 @@
     <string name="august">Серпень</string>
     <string name="september">Вересень</string>
     <string name="october">Жовтень</string>
-    <string name="faint_loss_description">Ваш рівень знижено до <b>%d</b>, ви втратили <b>%d</b> золота, та зламали <b>частину вашого обладнання</b>…</string>
+    <string name="faint_loss_description">Ваш рівень знижено до <b>%1$d</b>, ви втратили <b>%2$d</b> золота, та зламали <b>частину вашого обладнання</b>…</string>
     <string name="account_reset">Скидання облікового запису</string>
     <string name="avatar_skin_customization">Налаштування шкіри аватара</string>
     <string name="avatar_shirt_customization">Налаштування сорочки аватара</string>
@@ -1318,4 +1317,4 @@
     <string name="visit_the_market">Відвідати ринок</string>
     <string name="thanks_for_support">Вдячні за вашу підтримку!</string>
     <string name="birthday_title_description">Святкуйте 10-річчя Habitica з подарунками та ексклюзивними речами нижче!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 8c946e912..f02b0ed66 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -519,11 +519,11 @@
     <string name="world_boss">世界 boss</string>
     <string name="boss_art">Boss 圖像</string>
     <string name="world_boss_description">世界 boss 簡介</string>
-    <string name="rage_strike_count">暴走攻擊：%d/%d</string>
+    <string name="rage_strike_count" formatted="false">暴走攻擊：%d/%d</string>
     <string name="pending_strike_title">即將造成的攻擊</string>
     <string name="strike_description_title">暴走攻擊是什麽？</string>
     <string name="strike_active_title">%s被攻擊了！</string>
-    <string name="strike_active_description">我們心愛的%s在%s攻擊%s時被徹底摧毀了！快點！完成你的任務來打敗怪物，幫忙重建！</string>
+    <string name="strike_active_description">我們心愛的%1$s在%2$s攻擊%3$s時被徹底摧毀了！快點！完成你的任務來打敗怪物，幫忙重建！</string>
     <string name="questShop">副本商店</string>
     <string name="market_owner_long">商人 Alex</string>
     <string name="tavern_owner_long">酒館老闆 Daniel</string>
@@ -556,7 +556,6 @@
     <string name="moderator">管理員</string>
     <string name="levelup_header">你升到第 %1$d 級！</string>
     <string name="levelup_detail">透過完成你在現實生活中的目標，你現在已經升級並完全治癒了！</string>
-    <string name="faint_penalty_body">你降了一級，丟失了所有的金幣和一件裝備。不過繼續努力，你就可以把他們都拿回來！加油，你會更棒的。</string>
     <string name="reminder_title">記得完成你的任務</string>
     <string name="warrior_description">戰士有更高的暴擊率，可以對Boss打出更高的傷害。如果你想輕鬆打敗怪物，就當個戰士吧！高力量值有利於戰士。</string>
     <string name="opting_out_progress">退出</string>
@@ -802,7 +801,7 @@
     <string name="id_copied">已將用戶ID複製到剪貼板</string>
     <string name="copy_username">複製用戶名</string>
     <string name="password_too_short">您的密碼長度至少為%d個字符</string>
-    <string name="invitation_title">%s邀請你加入他們的小組%s</string>
+    <string name="invitation_title">%1$s邀請你加入他們的小組%2$s</string>
     <string name="someone">有人</string>
     <string name="authentication_methods">認證方式</string>
     <string name="local">本地</string>
@@ -864,8 +863,8 @@
     <string name="task_title">任務標題</string>
     <string name="add_local_authentication">新增地區性驗證</string>
     <string name="defeat">擊退</string>
-    <string name="gift_confirmation_text_sub">你送給%s一個%s個月的Habitica訂閱。</string>
-    <string name="gift_confirmation_text_sub_g1g1">你送給%s一個%s個月的Habitica訂閱，由於買一贈一促銷活動，你也獲得了同樣時長的訂閱！</string>
+    <string name="gift_confirmation_text_sub">你送給%1$s一個%2$s個月的Habitica訂閱。</string>
+    <string name="gift_confirmation_text_sub_g1g1">你送給%1$s一個%2$s個月的Habitica訂閱，由於買一贈一促銷活動，你也獲得了同樣時長的訂閱！</string>
     <string name="gift_gems_subtitle">在下面選擇你要贈送的寶石包！</string>
     <string name="join_party_description_guild">將下方的使用者名稱發給好友，或是前往%s找尋隊友！</string>
     <string name="insufficientGoldTitle">金幣不足</string>
@@ -961,8 +960,8 @@
     <string name="off">關</string>
     <string name="on">開</string>
     <string name="suggest_pet_hatch_again_missing_potion">你還需要一瓶%s藥水才能再次孵化這個寵物</string>
-    <string name="suggest_pet_hatch_again_missing_both">你需要一個%s和%s藥劑才能再次孵化這個寵物</string>
-    <string name="can_hatch_pet">對你的%s蛋使用%s藥水來孵化這個寵物吧！</string>
+    <string name="suggest_pet_hatch_again_missing_both">你需要一個%1$s和%2$s藥劑才能再次孵化這個寵物</string>
+    <string name="can_hatch_pet">對你的%1$s蛋使用%2$s藥水來孵化這個寵物吧！</string>
     <string name="hatch_pet">孵化寵物</string>
     <string name="unhatched_pet">未孵化的寵物</string>
     <string name="hatch_pet_again">再次孵化寵物</string>
@@ -983,13 +982,13 @@
     <string name="pet_category">%s寵物</string>
     <string name="mount_category">%s坐騎</string>
     <string name="suggest_pet_hatch_again_missing_egg">你還需要一個%s蛋才能再次孵化這個寵物</string>
-    <string name="suggest_pet_hatch_missing_both">你需要一個%s和一瓶%s藥水才能孵化這個寵物</string>
+    <string name="suggest_pet_hatch_missing_both">你需要一個%1$s和一瓶%2$s藥水才能孵化這個寵物</string>
     <string name="suggest_pet_hatch_missing_potion">你還需要一個%s孵化藥水來孵化這個寵物</string>
     <string name="suggest_pet_hatch_missing_egg">你還需要一個%s寵物蛋來孵化這個寵物任務</string>
     <string name="view_onboarding_tasks">查看新手任務</string>
     <string name="equip">裝備</string>
     <string name="unequip">取消裝備</string>
-    <string name="excessItemsNoneLeft">你已經有得到所有%s寵物所需的一切物品。你確定你要買%2$d個%3$s？</string>
+    <string name="excessItemsNoneLeft">你已經有得到所有%1$s寵物所需的一切物品。你確定你要買%2$d個%3$s？</string>
     <string name="purchaseX">買%d個</string>
     <string name="excessItemsXLeft">你只需要%3$d個%2$s即可孵化所有可得到的這種寵物。你確定你想要買%1$d個？</string>
     <string name="feedPet_description">完成任務有概率掉落寵物食品！這樣你就可以把寵物餵大長成坐騎啦！</string>
@@ -1076,7 +1075,7 @@
     <string name="empty_challenge_list">您尚未成為任何挑戰中的一位成員。</string>
     <string name="todo_item_checkbox">待辦事項核取方塊</string>
     <string name="empty_equipment_description">您目前還尚未有任何這類型的裝備。您可以透過市集並使用您所賺取來的金幣去採購裝備。</string>
-    <string name="fall_promo_info_instructions">取決於 %s 和 %s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
+    <string name="fall_promo_info_instructions">取決於 %1$s 和 %2$s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
     <string name="terms_of_service">服務條款</string>
     <string name="privacy_policy">隱私權政策</string>
     <string name="all_tasks_completed">您已完成您全部的任務。做得好！</string>
@@ -1098,7 +1097,7 @@
     <string name="quest_leave_message">您確定您要離開此副本？所有您的副本進展將會遺失。</string>
     <string name="quest_leave_message_nostart">您確定您要離開此副本？您將無法參與其中。</string>
     <string name="avatar_style">風格</string>
-    <string name="x_to_y">從%s到%s</string>
+    <string name="x_to_y">從%1$s到%2$s</string>
     <string name="open_website">開放網站</string>
     <string name="create_guild_description">去設立一個公會，登入至 Habitica網站並點選“我的公會”頁面中的 “設立”按鈕。</string>
     <string name="create_guild">設立公會</string>
@@ -1113,7 +1112,7 @@
     <string name="spooky_promo_info_prompt">此寶石折扣回歸去追尋今年最終的秋季節慶！這是一個最後的機會去擁有更多更多的寶石，所以當它還持續時請大量囤購吧！</string>
     <string name="view_gem_bundles">查看寶石組合包</string>
     <string name="fall_promo_info_prompt">此秋季節慶正在最高潮期所以我們認為這是個最好的時機去推出我們第一次的寶石折扣！現在你將會於每一次的購物上得到比之前更多的寶石。</string>
-    <string name="spooky_promo_info_instructions">取決於 %s 和 %s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
+    <string name="spooky_promo_info_instructions">取決於 %1$s 和 %2$s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
     <string name="adjust_counter">修正計數器</string>
     <string name="reset_counter">重設計數器</string>
     <string name="go_to_survey">去填寫問卷</string>
@@ -1156,7 +1155,7 @@
     <string name="reset_account_title">你確定需要重置\?</string>
     <string name="confirm_reset">確定重置</string>
     <string name="forgot_password_hint_example">例子：habitrabbit or gryphon@example.com</string>
-    <string name="gift_confirmation_text_gems_new">你送了%s%s寶石。</string>
+    <string name="gift_confirmation_text_gems_new">你送了%1$s%2$s寶石。</string>
     <string name="subscription_confirmation_multiple">你已訂閱了%s個月</string>
     <string name="subscription_confirmation">你已訂閱1個月</string>
     <string name="gem_purchase_confirmation">你獲得了%s寶石。</string>
@@ -1173,7 +1172,7 @@
     <string name="october">十月</string>
     <string name="november">十一月</string>
     <string name="december">十二月</string>
-    <string name="class_confirmation_price">更改你的職業成為%s需要%d的寶石，確認更改\?</string>
+    <string name="class_confirmation_price">更改你的職業成為%1$s需要%2$d的寶石，確認更改\?</string>
     <string name="armoireEquipment_new">你在衣櫥裏找到了一個稀有裝備！</string>
     <string name="starting_objectives">新手任務</string>
     <string name="damage_pending">%s即將造成的傷害</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 49a2619d3..157a077c7 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -69,7 +69,6 @@
     <string name="levelup_detail">通过完成现实生活中的目标，你提升了等级并且恢复了满血状态！</string>
     <string name="onwards">继续前进！</string>
     <string name="faint_subtitle">别灰心！</string>
-    <string name="faint_penalty_body">你降了一级，失去了所有金币和一件装备。但你可以通过努力把它们都找回来！ 祝你好运——你能做到的。</string>
     <string name="faint_header">你的生命值耗尽了！</string>
     <string name="faint_button">回满生命值并再试一次</string>
     <string name="filter">筛选</string>
@@ -520,7 +519,7 @@
     <string name="world_boss">世界Boss</string>
     <string name="boss_art">boss图像</string>
     <string name="world_boss_description">世界boss简介</string>
-    <string name="rage_strike_count">暴走：%d/%d</string>
+    <string name="rage_strike_count" formatted="false">暴走：%d/%d</string>
     <string name="strike_description_title">什么是暴击？</string>
     <string name="strike_active_title">%s被攻击了！</string>
     <string name="questShop">副本商店</string>
@@ -560,7 +559,7 @@
     <string name="distribute_task_help">根据你已完成任务的关联属性：力量，智力，体质和感知来分配点数。</string>
     <string name="staff_moderators">工作人员和管理员</string>
     <string name="pending_strike_title">即将造成的攻击</string>
-    <string name="strike_active_description">我们心爱的 %s 在 %s 攻击 %s 时被彻底破坏了，快抓紧时间完成你的任务来打败怪物，帮助我们重建！</string>
+    <string name="strike_active_description">我们心爱的 %1$s 在 %2$s 攻击 %3$s 时被彻底破坏了，快抓紧时间完成你的任务来打败怪物，帮助我们重建！</string>
     <string name="no_party_description">和朋友一同完成副本或者独自出击。和怪物战斗，创建挑战，能力越大，责任越大。</string>
     <string name="join_party_description">把下方的用户名给一个队伍成员，这样他们就能邀请你加入了</string>
     <string name="insufficientSubscriberGems">你已经买空了这个月所有的宝石限额！每月可购买的宝石将于当月前三天内上架，感谢你的订阅！</string>
@@ -778,7 +777,7 @@
     <string name="id_copied">已将用户ID复制到剪贴板</string>
     <string name="password_too_short">您的密码长度至少为%d个字符</string>
     <string name="copy_username">复制用户名</string>
-    <string name="invitation_title">%s邀请你加入他们的小组%s</string>
+    <string name="invitation_title">%1$s邀请你加入他们的小组%2$s</string>
     <string name="someone">有人</string>
     <string name="authentication_methods">认证方式</string>
     <string name="local">本地</string>
@@ -1033,10 +1032,10 @@
     <string name="unblock_user">解除屏蔽此用户</string>
     <string name="pms_disabled_description">你依旧能正常发送私信给他人，但没人能发送私信给你。在设置中可重启接收私信功能。</string>
     <string name="spooky_promo_info_prompt">今年在秋季庆典的宝石特卖会步入尾声！这是最后一次获得更多宝石的机会，请趁早囤货！</string>
-    <string name="spooky_promo_info_instructions">在%s至3%s期间，只需像往常一样购买任何宝石捆绑包，你的账户就会记入促销金额赠送的宝石数。获得的更多宝石可以用来消费、赠送或未来使用！</string>
+    <string name="spooky_promo_info_instructions">在%1$s至3%2$s期间，只需像往常一样购买任何宝石捆绑包，你的账户就会记入促销金额赠送的宝石数。获得的更多宝石可以用来消费、赠送或未来使用！</string>
     <string name="view_gem_bundles">查看宝石捆绑包</string>
     <string name="fall_promo_info_prompt">秋季盛典正在如火如荼的进行中，所以我们认为这是我们首次推出宝石特卖会的最佳时机！现在你每次购买都会获得比以往更多的宝石。现在你每次购买都将获得比以往更多的宝石。</string>
-    <string name="fall_promo_info_instructions">在%s至%s间，只需像往常一样购买任何宝石捆绑包，你的账户就会记入促销金额赠送的宝石数。获得的更多宝石可以用来消费、赠送或未来使用！</string>
+    <string name="fall_promo_info_instructions">在%1$s至%2$s间，只需像往常一样购买任何宝石捆绑包，你的账户就会记入促销金额赠送的宝石数。获得的更多宝石可以用来消费、赠送或未来使用！</string>
     <string name="limitations">限制</string>
     <string name="how_it_works">如何工作</string>
     <string name="x_to_y">%1$s致%2$s</string>
@@ -1117,7 +1116,7 @@
     <string name="privacy_policy">隐私政策</string>
     <string name="all_tasks_completed">你完成了所有任务。干得漂亮！</string>
     <string name="discard">放弃</string>
-    <string name="class_confirmation_price">转职为%s需要%d宝石，是否确定更改？</string>
+    <string name="class_confirmation_price">转职为%1$s需要%2$d宝石，是否确定更改？</string>
     <string name="use_item">对队伍成员使用物品</string>&gt;
     <string name="unsaved_changes">修改未保存</string>
     <string name="damage_pending">即将造成%s点伤害</string>
@@ -1207,7 +1206,7 @@
     <string name="death_description">但是你能通过努力把它们都赢回来！祝你好运——你会做好的。</string>
     <string name="faint_broken_equipment">丢失的装备可以重新购买
 \n来自奖励</string>
-    <string name="faint_loss_description">你会降至<b>%d</b>级，失去 <b>%d</b>金币，并失去<b>一个装备</b>！……只要努力，你就能把它们赚回来！</string>
+    <string name="faint_loss_description">你会降至<b>%1$d</b>级，失去 <b>%2$d</b>金币，并失去<b>一个装备</b>！……只要努力，你就能把它们赚回来！</string>
     <string name="account_reset">账号重置</string>
     <string name="avatar_skin_customization">自定义角色皮肤</string>
     <string name="avatar_shirt_customization">自定义角色上衣</string>
@@ -1356,7 +1355,6 @@
     <string name="change_class_message">这将移除您当前的职业并退还所有属性点数，然后你可以选择一个新职业</string>
     <string name="reset_account_description_no_pw">你将会失去所有的等级、金币和经验。你设置的所有任务及其任务历史数据将会被删除（挑战任务除外）。你将失去除了订阅者物品和免费纪念物品外的所有装备，但你之后可以重新购买被删除的物品。重新购买职业专属装备需要对应的职业。你当前的职业、成就、宠物和坐骑将会保留。如果你已确定要重置数据，请在下方输入“RESET”。</string>
     <string name="report_message_explanation">您只能举报违反[社区准则](https://habitica.com/static/community-guidelines)和/或[服务条款](https://habitica.com/static/terms)的帖子。提交虚假报告违反了 Habitica 社区准则。</string>
-    <string name="g1g1_promo_info_limitations_fixed">这是一个限时活动，从 %1$s (%2$s) 开始，到 %3$s (%4$s) 结束。此促销活动仅适用于您向另一位Habitican赠送礼物。如果您或您的收礼人已经订阅，则赠送的订阅将增加订阅月份，只有在当前订阅被取消或过期后才能使用。</string>
     <string name="todo_summary_description">这是一项没有截止日期的 **%1$s** 任务。</string>
     <string name="shadow_mute_user">禁言</string>
     <string name="plenty_of_potions_description">我们返场了 10 种最受社区欢迎的魔法孵化药水。前往 \"市场 \"来完善你的收藏吧！</string>
@@ -1415,4 +1413,4 @@
     <string name="customize_avatar">自定义角色形象</string>
     <string name="open_profile">打开个人资料</string>
     <string name="list">清单</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 684b8f389..b47d8830a 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -305,7 +305,7 @@
     <string name="opt_out_class">Opt Out</string>
     <string name="opting_out_progress">Opting Out</string>
     <string name="class_confirmation">Are you sure you want to be a %s?</string>
-    <string name="class_confirmation_price">Do you want to change your class to %s for %d Gems?</string>
+    <string name="class_confirmation_price">Do you want to change your class to %1$s for %2$d Gems?</string>
     <string name="class_changed">You\'re a %s!</string>
     <string name="class_changed_description">You can now use %s skills and purchase gear from shops. Gain levels to earn stat points you can use to power up your skills.</string>
     <string name="choose_class">Choose Class</string>
@@ -684,11 +684,11 @@
     <string name="world_boss">World Boss</string>
     <string name="boss_art">Boss Art</string>
     <string name="world_boss_description">World Boss Description</string>
-    <string name="rage_strike_count">Rage Strikes: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Rage Strikes: %d/%d</string>
     <string name="pending_strike_title">Pending Strike</string>
     <string name="strike_description_title">What’s a Rage Strike?</string>
     <string name="strike_active_title">The %s was Attacked!</string>
-    <string name="strike_active_description">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
+    <string name="strike_active_description">Our beloved %1$s was devastated when the %2$s shattered the %3$s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
     <string name="questShop">Quests</string>
     <string name="market_owner_long">Alex the Merchant</string>
     <string name="tavern_owner_long">Daniel the inn keeper</string>
@@ -958,7 +958,7 @@
     <string name="id_copied">Copied User ID to clipboard</string>
     <string name="copy_username">Copy Username</string>
     <string name="password_too_short">Your password has to be at least %d characters long</string>
-    <string name="invitation_title">%s invited you to join their group %s</string>
+    <string name="invitation_title">%1$s invited you to join their group %2$s</string>
     <string name="someone">Someone</string>
     <string name="authentication_methods">Authentication Methods</string>
     <string name="local">local</string>
@@ -1146,10 +1146,10 @@
     <string name="x_to_y">%1$s to %2$s</string>
     <string name="how_it_works">How it works</string>
     <string name="limitations">Limitations</string>
-    <string name="fall_promo_info_instructions">Between %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="fall_promo_info_instructions">Between %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="fall_promo_info_prompt">The Fall Gala is in full swing so we thought it was the perfect time for a Gem Sale! Now you will get more Gems with each purchase than ever before.</string>
     <string name="view_gem_bundles">View Gem Bundles</string>
-    <string name="spooky_promo_info_instructions">Between %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="spooky_promo_info_instructions">Between %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="gems_promo_info_limitations_fixed">This promotion only applies during the limited time event. This event starts on %1$s (%2$s) and will end %3$s (%4$s). The promo offer is only available when buying Gems for yourself.</string>
     <string name="spooky_promo_info_prompt">The Gem Sale is back to haunt the very end of this year’s Fall Gala! This is one last chance to get more Gems than ever, so stock up while it lasts!</string>
     <string name="dark_mode">Dark Mode</string>
@@ -1285,8 +1285,8 @@
     <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 \nfrom the Market</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="faint_loss_description_alt"><![CDATA[You’ll drop to level <b>%d</b>, lose <b>%d</b> Gold, and your Experience… You can earn them all back with hard work!]]></string>
+    <string name="faint_loss_description"><![CDATA[You’ll drop to level <b>%1$d</b>, lose <b>%2$d</b> Gold, and break <b>a piece of gear</b>… You can earn them all back with hard work!]]></string>
+    <string name="faint_loss_description_alt"><![CDATA[You’ll drop to level <b>%1$d</b>, lose <b>%2$d</b> Gold, and your Experience… 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>
@@ -1569,7 +1569,7 @@
     <string name="thanks_for_subscribing">Thanks for subscribing</string>
     <string name="set">Set</string>
     <string name="rescrubscribe_to_pick_up">Resubscribe to pick up where you left off!</string>
-    <string name="gem_cap_extra">%d/%d Gem Cap</string>
+    <string name="gem_cap_extra">%1$d/%2$d Gem Cap</string>
     <string name="open_habitica_website">Open Habitica Website</string>
     <string name="nye">New Year\'s Eve</string>
     <string name="valentines">Valentines</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index f99b525c2..61e17c7c6 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -60,6 +60,7 @@
 
         <item name="android:statusBarColor">@color/transparent</item>
         <item name="android:navigationBarColor">@color/transparent</item>
+        <item name="enableEdgeToEdge">true</item>
 
         <item name="searchViewStyle">@style/SearchViewStyle</item>
         <item name="toolbarContentColor">@color/text_primary</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index c2d69a1e7..792c8e1c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -99,7 +99,7 @@ abstract class BaseActivity : AppCompatActivity() {
     internal var navigationBarStyle: SystemBarStyle? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge(navigationBarStyle = navigationBarStyle ?: defaultNavigationBarStyle)
+        enableEdgeToEdge()
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         val languageHelper = LanguageHelper(sharedPreferences.getString("language", "en"))
         resources.forceLocale(this, languageHelper.locale)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
index 5a017009f..750c13820 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
@@ -54,7 +54,6 @@ class IntroActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            window.navigationBarColor = ContextCompat.getColor(this, R.color.black)
             window.isNavigationBarContrastEnforced = false
             val controller = WindowCompat.getInsetsController(window, window.decorView)
             controller.isAppearanceLightNavigationBars = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
index a170a67da..5e91aa989 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
@@ -100,7 +100,7 @@ abstract class BaseMainFragment<VB : ViewBinding> : BaseFragment<VB>() {
                 view?.systemUiVisibility
                 window.setNavigationBarDarkIcons(false)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.isNavigationBarContrastEnforced = true
+                    window.isNavigationBarContrastEnforced = false
                 }
             } else {
                 windowInsetsController.isAppearanceLightNavigationBars = requireActivity().isUsingNightModeResources()
diff --git a/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt b/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt
index 35d29aff3..54442cebf 100644
--- a/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt
@@ -23,7 +23,7 @@ class ApplicationPlugin : Plugin<Project> {
                     signingProps.containsKey("KEY_ALIAS") && signingProps.containsKey("KEY_PASSWORD")
 
             val versionProps = try {
-                Properties().apply { load(FileInputStream(File("version.properties"))) }
+                Properties().apply { load(FileInputStream(File(projectDir.absolutePath + "/../version.properties"))) }
             } catch (t: Throwable) {
                 Properties()
             }
@@ -65,4 +65,4 @@ class ApplicationPlugin : Plugin<Project> {
             }
         }
     }
-}
\ No newline at end of file
+}