Merge "Toast design polish" into sc-dev