Merge "Fix sizes and paddings" into sc-dev