Merge "Fix the suggestion button distortion" into sc-dev