Merge "Toast apperance updates" into sc-dev