Update, now with location icons