[8859] - Merging @Mark-H PR (475) with PR 471 so buttons resize properly