Issue #121: Simplified favorite button class handling.