Merge "Remove button padding value for the icon to work with the max display scale" into main