Merge "Next styling for volume control"