ALM-607 further tweaks of source badges