diff --git a/packs/spell-effects/spell-effect-mantle-of-the-frozen-heart.json b/packs/spell-effects/spell-effect-mantle-of-the-frozen-heart.json
index c61fbf97bb4..f514d790685 100644
--- a/packs/spell-effects/spell-effect-mantle-of-the-frozen-heart.json
+++ b/packs/spell-effects/spell-effect-mantle-of-the-frozen-heart.json
@@ -4,7 +4,7 @@
     "name": "Spell Effect: Mantle of the Frozen Heart",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Mantle of the Frozen Heart]</p>\n<p>Pick two of the options below. As a single action, which has the concentrate trait, you can change one of your chosen abilities to a different option from the list.</p><ul><li><strong>Chilling Ice</strong> You gain resistance 10 to cold.</li><li><strong>Ice Glide</strong> While moving along a smooth surface, you gain a +20-foot status bonus to your land Speed.</li><li><strong>Icy Claws</strong> Your hands morph into vicious, piercing claws of ice useful for attacking or climbing. As long as you have both hands free, you gain a climb Speed equal to your land Speed. You gain a claw unarmed attack with the agile and finesse traits, in the brawling weapon group. Your claw attack deals 1d6 piercing damage as its base damage, plus an additional 2d6 cold damage.</li></ul>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Mantle of the Frozen Heart]</p>\n<p>Pick two of the options below. As a single action, which has the concentrate trait, you can change one of your chosen abilities to a different option from the list.</p><ul><li><strong>Chilling Ice</strong> You gain resistance 10 to cold.</li><li><strong>Heart of Ice</strong> Any creature that touches you, or that hits you with a melee unarmed attack or non-reach melee weapon attack, takes 2d6 cold damage.</li><li><strong>Ice Glide</strong> While moving along a smooth surface, you gain a +20-foot status bonus to your land Speed.</li><li><strong>Icy Claws</strong> Your hands morph into vicious, piercing claws of ice useful for attacking or climbing. As long as you have both hands free, you gain a climb Speed equal to your land Speed. You gain a claw unarmed attack with the agile and finesse traits, in the brawling weapon group. Your claw attack deals 1d6 piercing damage as its base damage, plus an additional 2d6 cold damage.</li></ul>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -121,6 +121,19 @@
                 "type": "cold",
                 "value": 10
             },
+            {
+                "domain": "all",
+                "key": "RollOption",
+                "option": "self:heart-of-ice",
+                "predicate": [
+                    {
+                        "or": [
+                            "frozen-heart-first:heart-of-ice",
+                            "frozen-heart-second:heart-of-ice"
+                        ]
+                    }
+                ]
+            },
             {
                 "key": "FlatModifier",
                 "predicate": [
@@ -187,6 +200,23 @@
                 ],
                 "selector": "climb-speed",
                 "value": "@actor.attributes.speed.total"
+            },
+            {
+                "key": "Note",
+                "predicate": [
+                    "self:heart-of-ice",
+                    {
+                        "or": [
+                            "item:trait:melee",
+                            {
+                                "not": "item:trait:reach"
+                            }
+                        ]
+                    }
+                ],
+                "selector": "damage-received",
+                "text": "PF2E.SpecificRule.SpellEffectMantle.FrozenHeart.DamageNote.HeartOfIce",
+                "title": "{item|name}"
             }
         ],
         "start": {
diff --git a/packs/spell-effects/spell-effect-mantle-of-the-magma-heart.json b/packs/spell-effects/spell-effect-mantle-of-the-magma-heart.json
index c74cfe10352..c368821e7d6 100644
--- a/packs/spell-effects/spell-effect-mantle-of-the-magma-heart.json
+++ b/packs/spell-effects/spell-effect-mantle-of-the-magma-heart.json
@@ -4,7 +4,7 @@
     "name": "Spell Effect: Mantle of the Magma Heart",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Mantle of the Magma Heart]</p>\n<p>Pick two of the options below. As a single action, which has the concentrate trait, you can change one of your chosen abilities to a different option from the list.</p><ul><li><strong>Enlarging Eruption</strong> You grow to size Large. You're clumsy 1. Your reach increases by 5 feet (or by 10 feet if you started out Tiny), and you gain a +2 status bonus to melee damage. You can't choose this option if you're already Large or larger.</li><li><strong>Fiery Grasp</strong> You gain a lava fist unarmed attack in the brawling weapon group. Your lava fists deal 1d8 bludgeoning damage as their base damage, plus an additional 2d6 fire damage and 1d6 persistent fire damage.</li><li><strong>Warming Flames</strong> You gain resistance 5 to cold and fire.</li></ul>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Mantle of the Magma Heart]</p>\n<p>Pick two of the options below. As a single action, which has the concentrate trait, you can change one of your chosen abilities to a different option from the list.</p><ul><li><strong>Enlarging Eruption</strong> You grow to size Large. You're clumsy 1. Your reach increases by 5 feet (or by 10 feet if you started out Tiny), and you gain a +2 status bonus to melee damage. You can't choose this option if you're already Large or larger.</li><li><strong>Fiery Grasp</strong> You gain a lava fist unarmed attack in the brawling weapon group. Your lava fists deal 1d8 bludgeoning damage as their base damage, plus an additional 2d6 fire damage and 1d6 persistent fire damage.</li><li><strong>Heart of Fire</strong> any creature that touches you, or that hits you with a melee unarmed attack or non-reach melee weapon attack, takes 2d6 damage.</li><li><strong>Warming Flames</strong> You gain resistance 5 to cold and fire.</li></ul>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -93,6 +93,19 @@
                 ],
                 "toggleable": true
             },
+            {
+                "domain": "all",
+                "key": "RollOption",
+                "option": "self:heart-of-fire",
+                "predicate": [
+                    {
+                        "or": [
+                            "magma-heart-first:heart-of-fire",
+                            "magma-heart-second:heart-of-fire"
+                        ]
+                    }
+                ]
+            },
             {
                 "key": "FlatModifier",
                 "predicate": [
@@ -188,6 +201,23 @@
                 ],
                 "type": "fire",
                 "value": 5
+            },
+            {
+                "key": "Note",
+                "predicate": [
+                    "self:heart-of-fire",
+                    {
+                        "or": [
+                            "item:trait:melee",
+                            {
+                                "not": "item:trait:reach"
+                            }
+                        ]
+                    }
+                ],
+                "selector": "damage-received",
+                "text": "PF2E.SpecificRule.SpellEffectMantle.MagmaHeart.DamageNote.HeartOfFire",
+                "title": "{item|name}"
             }
         ],
         "start": {
diff --git a/static/lang/re-en.json b/static/lang/re-en.json
index 90b3aee1277..e147bfda8f9 100644
--- a/static/lang/re-en.json
+++ b/static/lang/re-en.json
@@ -5330,6 +5330,9 @@
                 "Text": "If you hit with your jaws and deal damage, you gain [[/r (ceil(@item.level/2))d6 #Temporary Hit Points]] temporary Hit Points."
             },
             "SpellEffectMantle": {
+                "DamageNote": {
+                    "HeartOfIce": "You take @Damage[2d6[cold]] damage"
+                },
                 "FrozenHeart": {
                    "Label": {
                        "ChillingIce": "Chilling Ice",
@@ -5344,6 +5347,9 @@
                    } 
                 },
                 "MagmaHeart": {
+                    "DamageNote": {
+                        "HeartOfFire": "You take @Damage[2d6[fire]] damage"
+                    },
                     "Label": {
                        "EnlargingEruption": "Enlarging Eruption",
                        "FieryGrasp": "Fiery Grasp",