Fixed Buttons Merging