Updated with latest changes (Icon Flick, etc.)