NXP-11179: Add indicator class in DAM, misc style fix