Merge "Fix missing BP icon" into main