Merge "Adjust size of action buttons" into sc-dev