Favorites icons, fixed favorites restart issue