Improving certificate UI see BT#9187