diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift
index eeda08af..796bf617 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift
@@ -79,7 +79,6 @@ import UIKit
         heightConstraint = heightAnchor.constraint(equalTo: widthAnchor, multiplier: 1)
         heightConstraint?.isActive = true
         isAccessibilityElement = true
-        accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "heart_action_hint")
         accessibilityTraits = .button
         updateAccessibilityLabel()
     }
@@ -97,10 +96,8 @@ import UIKit
     //--------------------------------------------------
     /// Adjust accessibility label based on selection of Heart.
     func updateAccessibilityLabel() {
-        if let message = MVMCoreUIUtility.hardcodedString(withKey: "heart"),
-            let selectedState = MVMCoreUIUtility.hardcodedString(withKey: isSelected ? "heart_selected_state" : "heart_not_selected_state") {
-            accessibilityLabel = message + selectedState
-        }
+        accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: isSelected ? "heart_unfavorite_action_hint" : "heart_favorite_action_hint")
+        accessibilityLabel = MVMCoreUIUtility.hardcodedString(withKey: isSelected ? "heart_selected_state" : "heart_not_selected_state")
     }
     
     func tapAction() {
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift
index b3d168ef..8001ddd5 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift
@@ -60,6 +60,6 @@ open class HeartModel: MoleculeModelProtocol {
         try container.encode(isActive, forKey: .isActive)
         try container.encode(activeColor, forKey: .activeColor)
         try container.encode(inActiveColor, forKey: .inActiveColor)
-        try container.encodeModelIfPresent(action, forKey: .action)
+        try container.encodeModel(action, forKey: .action)
     }
 }
diff --git a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
index db90b9b7..bbeadbdb 100644
--- a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
@@ -68,8 +68,8 @@
 "AccToggleHint" = "double tap to toggle";
 
 // MARK: Heart
-"heart" = "Favorite";
-"heart_action_hint" = "Double tap to favorite";
+"heart_favorite_action_hint" = "Double tap to favorite";
+"heart_unfavorite_action_hint" = "Double tap to unfavorite";
 "heart_selected_state" = "Favorited";
 "heart_not_selected_state" = "Unfavorited";
 
diff --git a/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
index d6bfb89c..0a37e1a5 100644
--- a/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
@@ -50,7 +50,8 @@
 "AccOff" = "apagado";
 "AccToggleHint" = "toca dos veces para alternar";
 // Heart
-"heart_action_hint" = "Toca dos veces en favorito";
+"heart_favorite_action_hint" = "Toca dos veces en favorito";
+"heart_unfavorite_action_hint" = "Toca dos veces para dejar de marcar como favorito";
 "heart_selected_state" = "Favoritos";
 "heart_not_selected_state" = "No favorito";
 // Carousel
diff --git a/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
index b06c972b..a64c3915 100644
--- a/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
@@ -53,7 +53,8 @@
 "AccToggleHint" = "toca dos veces para alternar";
 
 // Heart
-"heart_action_hint" = "Toca dos veces en favorito";
+"heart_favorite_action_hint" = "Toca dos veces en favorito";
+"heart_unfavorite_action_hint" = "Toca dos veces para dejar de marcar como favorito";
 "heart_selected_state" = "Favoritos";
 "heart_not_selected_state" = "No favorito";