Merge "Visual update: adjust button padding in conditional card"