Patch for I-116753

fixes for hp badges
also fixes tooltip