Fix favorites bug & add fav icon change