Merge "Updating QSB button padding to reflect change in asset." into ics-mr1